- Coffee - list.iid.ciirc.cvut.cz

[PATCH coffee-flask] Fix timezone related issue
by Jaroslav Klapalek 07 Sep '18

07 Sep '18

Datetime in database is stored in UTC format. Currently we are in UTC +2 timezone (GMT +1). Because of time shifts fixing the time cannot be done in a static way. Dynamic solution is using paramater 'localtime' in SQL query function date(). Therefore it is required for the target device to have properly set timezone. --- coffee_db.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/coffee_db.py b/coffee_db.py index 8c18e63..d3f659c 100644 --- a/coffee_db.py +++ b/coffee_db.py @@ -58,10 +58,10 @@ def add_coffee(uid, flavor, time=None): def list_coffees(uid=None): c = conn.cursor() if uid is None: - for row in c.execute("select id, time, flavor from coffees"): + for row in c.execute("select id, date(time, 'localtime'), flavor from coffees"): print(row) else: - for row in c.execute("select time, flavor from coffees where id = ?", (uid,)): + for row in c.execute("select date(time, 'localtime'), flavor from coffees where id = ?", (uid,)): print(row) def flavors(): @@ -96,7 +96,7 @@ def coffee_history(uid=None): if uid is None: res = list(c.execute(""" select strftime('%s', ds.d),count(c.flavor),c.flavor from - (select num,date('now',-num || ' days') as d from days) ds + (select num,date('now', 'localtime', -num || ' days') as d from days) ds left join coffees c on d = date(c.time) group by d, c.flavor """)) @@ -104,9 +104,9 @@ def coffee_history(uid=None): res = list(c.execute( """ select strftime('%s', ds.d),count(c.flavor),c.flavor from - (select num,date('now',-num || ' days') as d from days) ds + (select num,date('now', 'localtime', -num || ' days') as d from days) ds left join - (select time,flavor from coffees where id = ?) c + (select date(time, 'localtime') as time,flavor from coffees where id = ?) c on d = date(c.time) group by d, c.flavor """ , (uid,))) @@ -125,10 +125,10 @@ def coffee_count(uid=None, start=None, stop=None): args.append(uid) if start is not None: - clauses.append("date(time) >= date('now', '-%d days')" % int(start)) + clauses.append("date(time, 'localtime') >= date('now', 'localtime', '-%d days')" % int(start)) if stop is not None: - clauses.append("date(time) <= date('now', '-%d days')" % int(stop)) + clauses.append("date(time, 'localtime') <= date('now', 'localtime', '-%d days')" % int(stop)) for count, in c.execute( "select count(*) from coffees where " + -- 2.7.4

2 1

[PATCH mt-apps v5] Added list of scripts
by Tomas Prochazka 06 Sep '18

06 Sep '18

This scripts are needed to create Dialog window with calendar --- html/index.html | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/html/index.html b/html/index.html index 06f8fbf..8bd131f 100644 --- a/html/index.html +++ b/html/index.html @@ -5,13 +5,27 @@ <title>IID Coffee Terminal</title> <script> function loadServerScript() { - let script = document.createElement('script'); - script.src = "http://localhost:5000/js"; - document.head.append(script); - script.onerror = function() { - this.parentElement.removeChild(this); - setTimeout(loadServerScript, 10000); - }; +  + var scriptName= ["js", + "bower_components/moment/min/moment.min.js", + "bower_components/jquery/dist/jquery.min.js", + "bower_components/bootstrap/dist/js/bootstrap.min.js", + "bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js", + "bower_components/fullcalendar/dist/fullcalendar.min.js"]; + for(var i=0;i<scriptName.length;i++){ + const scriptPromise = new Promise((resolve, reject) => { + const script = document.createElement('script'); + script.src = "http://localhost:5000/"+scriptName[i]; + script.onload = resolve; + script.onerror = function() { +- document.head.removeChild(script); + setTimeout(loadServerScript, 10000); + reject; + }; + script.async = false; + document.head.appendChild(script); + }); + } } loadServerScript(); -- 2.11.0

1 0

[PATCH mt-apps v4] Added list of scripts
by Tomas Prochazka 06 Sep '18

06 Sep '18

This scripts are needed to create Dialog window with calendar --- html/index.html | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/html/index.html b/html/index.html index 06f8fbf..db039db 100644 --- a/html/index.html +++ b/html/index.html @@ -5,13 +5,26 @@ <title>IID Coffee Terminal</title> <script> function loadServerScript() { - let script = document.createElement('script'); - script.src = "http://localhost:5000/js"; - document.head.append(script); - script.onerror = function() { - this.parentElement.removeChild(this); - setTimeout(loadServerScript, 10000); - }; +  + var scriptName= ["js", + "bower_components/moment/min/moment.min.js", + "bower_components/jquery/dist/jquery.min.js", + "bower_components/bootstrap/dist/js/bootstrap.min.js", + "bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js", + "bower_components/fullcalendar/dist/fullcalendar.min.js"]; + for(var i=0;i<scriptName.length;i++){ + const scriptPromise = new Promise((resolve, reject) => { + const script = document.createElement('script'); + document.head.appendChild(script); + script.onload = resolve; + script.onerror = () => { + setTimeout(loadServerScript, 10000); + reject; + }; + script.async = false; + script.src = "http://localhost:5000/"+scriptName[i]; + }); + } } loadServerScript(); -- 2.11.0

3 2

[PATCH coffee-flask v4] Add function for add events to callendar
by Tomas Prochazka 05 Sep '18

05 Sep '18

A replaced of paper calendar with operations related to the maintenance of a coffee shop --- .gitmodules | 15 ++++++ app.py | 41 +++++++++++++++- coffee_db.py | 22 +++++++++ coffee_db.sql | 18 ++++++++ static/bower_components/bootstrap | 1 + static/bower_components/bootstrap3-dialog | 1 + static/bower_components/fullcalendar | 1 + static/bower_components/jquery | 1 + static/bower_components/moment | 1 + templates/calendar.html | 77 +++++++++++++++++++++++++++++++ templates/calendar.svg | 51 ++++++++++++++++++++ templates/events/box.svg | 68 +++++++++++++++++++++++++++ templates/events/machine.svg | 67 +++++++++++++++++++++++++++ templates/events/milk.svg | 68 +++++++++++++++++++++++++++ templates/events/milk_container.svg | 47 +++++++++++++++++++ templates/main.js | 27 +++++++++++ templates/user.html | 8 +++- 17 files changed, 512 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 static/bower_components/bootstrap create mode 160000 static/bower_components/bootstrap3-dialog create mode 160000 static/bower_components/fullcalendar create mode 160000 static/bower_components/jquery create mode 160000 static/bower_components/moment create mode 100644 templates/calendar.html create mode 100644 templates/calendar.svg create mode 100644 templates/events/box.svg create mode 100644 templates/events/machine.svg create mode 100644 templates/events/milk.svg create mode 100644 templates/events/milk_container.svg diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..5d289cc --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "static/bower_components/jquery"] + path = static/bower_components/jquery + url = https://github.com/jquery/jquery-dist.git +[submodule "static/bower_components/bootstrap"] + path = static/bower_components/bootstrap + url = https://github.com/twbs/bootstrap.git +[submodule "static/bower_components/bootstrap3-dialog"] + path = static/bower_components/bootstrap3-dialog + url = https://github.com/nakupanda/bootstrap3-dialog.git +[submodule "static/bower_components/moment"] + path = static/bower_components/moment + url = https://github.com/moment/moment +[submodule "static/bower_components/fullcalendar"] + path = static/bower_components/fullcalendar + url = https://github.com/fullcalendar/fullcalendar diff --git a/app.py b/app.py index 807f614..76f4963 100644 --- a/app.py +++ b/app.py @@ -1,6 +1,9 @@ -from flask import Flask, render_template, send_file, request, session, redirect, url_for, make_response +from flask import Flask, render_template, send_file, request, session, redirect, url_for, make_response, jsonify, abort, send_from_directory from flask_cors import CORS +import os +import os.path + import numpy as np import matplotlib matplotlib.use('Agg') @@ -163,6 +166,42 @@ def js(): response.headers['Content-Type'] = "text/javascript" return response +(a)app.route("/events/<image>") +def event_icon(image): + print(image) + svg = open('templates/events/'+image).read() + response = make_response(svg) + response.content_type = 'image/svg+xml' + return response + +(a)app.route("/event/add", methods=["POST"]) +def event_add(): + if request.method == "POST": + json = request.json + db.add_event(json["time"], json["event"], json["uid"]) + return redirect(url_for('user')) + +(a)app.route("/event_list") +def event_list(): + return jsonify(db.list_event()) + +(a)app.route("/calendar.svg") +def calender_icon(): + svg = open('templates/calendar.svg').read() + response = make_response(svg) + response.content_type = 'image/svg+xml' + return response + +(a)app.route('/calendar') +def calendar(): + return render_template('calendar.html',events=db.events()) + +(a)app.route('/bower_components/<path:filename>') +def download_file(filename): + if os.path.exists('static/bower_components/' + filename): + return send_from_directory('static/bower_components/', filename, as_attachment=True) + else: + abort(404) @app.route("/log", methods=["POST"]) def log(): diff --git a/coffee_db.py b/coffee_db.py index 8c18e63..ce0d1b5 100644 --- a/coffee_db.py +++ b/coffee_db.py @@ -54,6 +54,28 @@ def add_coffee(uid, flavor, time=None): c.execute("insert into coffees (id, flavor, time) values (?,?,?)", (uid, flavor, time)) close_db(conn) +def add_event(time, title, uid): + conn, c = open_db() + c.execute("insert into events (time,title,id) values (?,?,?)", (time,title,uid)) + close_db(conn) + +def list_event(): + conn, c = open_db() + result=c.execute("select e.time, e.title, l.image from events e left join (select * from list_events) l on e.title=l.title") + items=[] + for row in result: + items.append({'start': row[0], 'color': '#FFFFFF', 'imageurl':row[2]}) + close_db(conn) + return items + +def events(): #various events that can be created + conn, c = open_db() + result=c.execute("select title, image from list_events") + items=[] + for row in result: + items.append({'title': row[0],'image': row[1]}) + close_db(conn) + return items def list_coffees(uid=None): c = conn.cursor() diff --git a/coffee_db.sql b/coffee_db.sql index d9f7d8e..63367d8 100644 --- a/coffee_db.sql +++ b/coffee_db.sql @@ -28,6 +28,24 @@ create table if not exists days ( num integer primary key not null ); +create table if not exists events ( + time datetime, + title varchar(255), + id varchar(24) references users(id) +); + +create table if not exists list_events ( + title varchar(255) primary key not null, + image varchar(255) +); + +insert or ignore into list_events values + ("Milk container cleaned", "milk_container.svg"), + ("Coffee machine cleaned", "machine.svg"), + ("Milk washed wipill","milk.svg"), + ("New coffee opened","box.svg") +; + insert or ignore into days values (0),(1),(2),(3),(4),(5),(6) ; diff --git a/static/bower_components/bootstrap b/static/bower_components/bootstrap new file mode 160000 index 0000000..0b9c4a4 --- /dev/null +++ b/static/bower_components/bootstrap @@ -0,0 +1 @@ +Subproject commit 0b9c4a4007c44201dce9a6cc1a38407005c26c86 diff --git a/static/bower_components/bootstrap3-dialog b/static/bower_components/bootstrap3-dialog new file mode 160000 index 0000000..5304d56 --- /dev/null +++ b/static/bower_components/bootstrap3-dialog @@ -0,0 +1 @@ +Subproject commit 5304d56cd33da77b8c8e6e250e8f39211d191a0e diff --git a/static/bower_components/fullcalendar b/static/bower_components/fullcalendar new file mode 160000 index 0000000..3ddb3c8 --- /dev/null +++ b/static/bower_components/fullcalendar @@ -0,0 +1 @@ +Subproject commit 3ddb3c8d1461c6b841aed3487ba07d8ba338adb6 diff --git a/static/bower_components/jquery b/static/bower_components/jquery new file mode 160000 index 0000000..9e8ec3d --- /dev/null +++ b/static/bower_components/jquery @@ -0,0 +1 @@ +Subproject commit 9e8ec3d10fad04748176144f108d7355662ae75e diff --git a/static/bower_components/moment b/static/bower_components/moment new file mode 160000 index 0000000..0e67426 --- /dev/null +++ b/static/bower_components/moment @@ -0,0 +1 @@ +Subproject commit 0e67426b8e8d200a3ca7dab046040717110e87e6 diff --git a/templates/calendar.html b/templates/calendar.html new file mode 100644 index 0000000..d192fd4 --- /dev/null +++ b/templates/calendar.html @@ -0,0 +1,77 @@ +<!DOCTYPE html> +<html> + +<head> + <meta charset='utf-8' /> + <link rel="stylesheet" href="{{ url_for('static', filename='bower_components/fullcalendar/dist/fullcalendar.min.css', _external=True, stamp=stamp) }}"> + <script type=text/javascript> + var calendar; + $(document).ready(function() { + calendar = $('#calendar').fullCalendar({ + header: { + left: 'prev,next today', + center: 'title', + right: '' + }, + selectable: true, + selectHelper: true, + selectConstraint: { + start: '00:00', + end: '24:00' + }, + events: { + url: "{{ url_for('event_list', _external=True, stamp=stamp) }}" + }, + eventRender: function(event, eventElement) { + if (event.imageurl) { + var variable1 = event.imageurl; + eventElement.find(".fc-title").html("<center> <img src={{ url_for('event_icon', image='var1', _external=True, stamp=stamp) }} width='20' height='20' /> </center>".replace("var1", variable1)); + } + } + }); + }); + </script> + <style> + body { + margin: 20px 10px; + padding: 0; + font-family: "Lucida Grande", Helvetica, Arial, Verdana, sans-serif; + font-size: 14px; + } + #calendar { + max-width: 800px; + margin: 0 auto; + } + fieldset { + font-size: 15px; + padding: 10px; + width: 450px; + margin: 0 auto; + text-align: center; + line-height: 1.8; + } + </style> + +</head> + +<body> + <center> + <h2> <b>Coffee machine cleaning </b></h2> + <h3> Write the operation performed by pressing the button in this dialog window in the lower part.</h3> + <form> + <b>Operations: </b> + {% for event in events %} + <img style="vertical-align:middle" src="{{ url_for('event_icon', image=event.image, _external=True, stamp=stamp )}}" width="40" height="40"> + <span style="">{{ event.title }}</span> + {% endfor %} + </form> + <div id='calendar'></div> + <form> + {% for event in events %} + <button type="button" onclick="addEvent(this.value)" value="{{ event.title }}"> <img style="vertical-align:middle" src="{{ url_for('event_icon', image=event.image, _external=True, stamp=stamp )}}" width="30" height="30"> </button> + {% endfor %} + </form> + </center> +</body> + +</html> diff --git a/templates/calendar.svg b/templates/calendar.svg new file mode 100644 index 0000000..4d781eb --- /dev/null +++ b/templates/calendar.svg @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> + +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#77B3D4;} + .st1{opacity:0.2;} + .st2{fill:#231F20;} + .st3{fill:#FFFFFF;} + .st4{fill:#C75C5C;} + .st5{fill:#4F5D73;} + .st6{fill:#E0E0D1;} +</style> +<g id="Layer_1"> + <g> + <circle class="st0" cx="32" cy="32" r="32"/> + </g> + <g> + <g class="st1"> + <path class="st2" d="M12,25v25c0,2.2,1.8,4,4,4h32c2.2,0,4-1.8,4-4V25H12z"/> + </g> + <g> + <path class="st3" d="M12,23v25c0,2.2,1.8,4,4,4h32c2.2,0,4-1.8,4-4V23H12z"/> + </g> + <g class="st1"> + <path class="st2" d="M48,14H16c-2.2,0-4,1.8-4,4v7h40v-7C52,15.8,50.2,14,48,14z"/> + </g> + <g> + <path class="st4" d="M48,12H16c-2.2,0-4,1.8-4,4v7h40v-7C52,13.8,50.2,12,48,12z"/> + </g> + <g> + <path class="st5" d="M32,48c-1.1,0-2-0.9-2-2c0-5.5,1.8-9.5,3.5-12H27c-1.1,0-2-0.9-2-2s0.9-2,2-2h11c0.9,0,1.6,0.6,1.9,1.4 + s0,1.7-0.7,2.2C39,33.8,34,37.5,34,46C34,47.1,33.1,48,32,48z"/> + </g> + <g class="st1"> + <path class="st2" d="M20,21c-1.1,0-2-0.9-2-2v-7c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2v7C22,20.1,21.1,21,20,21L20,21z"/> + </g> + <g class="st1"> + <path class="st2" d="M45,21c-1.1,0-2-0.9-2-2v-7c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2v7C47,20.1,46.1,21,45,21L45,21z"/> + </g> + <g> + <path class="st6" d="M20,19c-1.1,0-2-0.9-2-2v-7c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2v7C22,18.1,21.1,19,20,19L20,19z"/> + </g> + <g> + <path class="st6" d="M45,19c-1.1,0-2-0.9-2-2v-7c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2v7C47,18.1,46.1,19,45,19L45,19z"/> + </g> + </g> +</g> +<g id="Layer_2"> +</g> +</svg> diff --git a/templates/events/box.svg b/templates/events/box.svg new file mode 100644 index 0000000..2bcbbf1 --- /dev/null +++ b/templates/events/box.svg @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg8" + version="1.1" + viewBox="0 0 35.000072 35.000072" + height="35.000072mm" + width="35.000072mm" + sodipodi:docname="box.svg" + inkscape:version="0.92.1 r15371"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1016" + id="namedview9" + showgrid="false" + inkscape:zoom="1.7840439" + inkscape:cx="-44.841946" + inkscape:cy="65.020819" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:22.57777786px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#c49347;fill-opacity:1;stroke:none;stroke-width:0.26458332;" + x="7.6817751" + y="25.313768" + id="text4487"><tspan + id="tspan4485" + x="7.6817751" + y="25.313768" + style="font-size:22.57777786px;fill:#c49347;fill-opacity:1;stroke-width:0.26458332;">N</tspan></text> + <rect + style="opacity:0.98999999;fill:none;fill-opacity:1;stroke:#c49347;stroke-width:2.39791874;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4505" + width="32.602345" + height="32.602345" + x="1.1988993" + y="1.198831" /> +</svg> diff --git a/templates/events/machine.svg b/templates/events/machine.svg new file mode 100644 index 0000000..2d2e606 --- /dev/null +++ b/templates/events/machine.svg @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg8" + version="1.1" + viewBox="0 0 35.000072 35.000072" + height="35.000072mm" + width="35.000072mm" + sodipodi:docname="machine.svg" + inkscape:version="0.92.1 r15371"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1016" + id="namedview9" + showgrid="false" + inkscape:zoom="1.7840439" + inkscape:cx="-47.084043" + inkscape:cy="66.141869" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:22.57777786px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#47c779;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="8.9252768" + y="25.313768" + id="text4487"><tspan + id="tspan4485" + x="8.9252768" + y="25.313768" + style="font-size:22.57777786px;fill:#47c779;fill-opacity:1;stroke-width:0.26458332">C</tspan></text> + <circle + style="opacity:0.98999999;fill:none;fill-opacity:1;stroke:#47c779;stroke-width:2.04399991;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path4489" + cx="17.500038" + cy="17.500036" + r="16.478037" /> +</svg> diff --git a/templates/events/milk.svg b/templates/events/milk.svg new file mode 100644 index 0000000..eb7c51e --- /dev/null +++ b/templates/events/milk.svg @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg8" + version="1.1" + viewBox="0 0 35.000072 35.000072" + height="35.000072mm" + width="35.000072mm" + sodipodi:docname="milk.svg" + inkscape:version="0.92.1 r15371"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1016" + id="namedview9" + showgrid="false" + inkscape:zoom="1.7840439" + inkscape:cx="67.262918" + inkscape:cy="66.141869" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:22.57777786px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0000c8;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="7.6817751" + y="25.313768" + id="text4487"><tspan + id="tspan4485" + x="7.6817751" + y="25.313768" + style="font-size:22.57777786px;fill:#0000c8;fill-opacity:1;stroke-width:0.26458332">M</tspan></text> + <rect + style="opacity:0.98999999;fill:none;fill-opacity:1;stroke:#0000c8;stroke-width:2.39779854;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4505" + width="32.602345" + height="32.602345" + x="1.1988993" + y="1.198831" /> +</svg> diff --git a/templates/events/milk_container.svg b/templates/events/milk_container.svg new file mode 100644 index 0000000..b31f75e --- /dev/null +++ b/templates/events/milk_container.svg @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + id="svg8" + version="1.1" + viewBox="0 0 35.000072 35.000072" + height="35.000072mm" + width="35.000072mm"> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + transform="translate(-23.989663,-42.769872)" + id="layer1"> + <text + id="text4487" + y="68.083641" + x="31.671438" + style="font-style:normal;font-weight:normal;font-size:22.57777786px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + xml:space="preserve"><tspan + style="font-size:22.57777786px;fill:#ff0000;stroke-width:0.26458332" + y="68.083641" + x="31.671438" + id="tspan4485">M</tspan></text> + <circle + r="16.478037" + cy="60.269909" + cx="41.4897" + id="path4489" + style="opacity:0.98999999;fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:2.04399991;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> +</svg> diff --git a/templates/main.js b/templates/main.js index 8135983..fd16b87 100644 --- a/templates/main.js +++ b/templates/main.js @@ -7,6 +7,7 @@ var timeToLogout = undefined; // defined during logout countdown var logoutTimer; var reloadTimer = undefined; var id_user; // ID of the user who is to be accounted for the next coffee +var dialog; console.log("hello from flask"); //sendJSON("{\"type\":\"empty\"}"); @@ -155,8 +156,17 @@ function login(id) { countingTimeLogout(120); } +function show_calendar(){ + var url="{{ url_for('calendar', _external=True, stamp=stamp) }}"; + dialog=BootstrapDialog.show({ + title: 'Calendar', + message: $('<div></div>').load(url) + }); +} + function logout() { sendReset(); + dialog.close(); ajax("GET", "logout", "", "user"); id_user = undefined; timeToLogout = undefined; @@ -202,6 +212,23 @@ function addCoffee(flavor, time = new Date()) { } } +function addEvent(event, time = new Date()) { + var data = JSON.stringify({ + time: time.toISOString().split("T")[0], + event: event, + uid: id_user + }); + if (id_user) { + ajax("POST", "event/add", data, ""); + dialog.close(); + dialog=BootstrapDialog.show({ + title: 'Information', + message: 'Event('+event+') add to calendar (this dialog will automatically close in 5 seconds)' + }); + setTimeout(function(){ dialog.close(); }, 5000); + } +} + function sendLog(json) { ajax("POST", "log", json, "log"); } diff --git a/templates/user.html b/templates/user.html index 95ee95e..4b31077 100644 --- a/templates/user.html +++ b/templates/user.html @@ -1,4 +1,10 @@ {% if name %} + + <link rel="stylesheet" href="{{ url_for('static', filename='bower_components/bootstrap/dist/css/bootstrap.min.css', _external=True, stamp=stamp) }}"> + <link rel="stylesheet" href="{{ url_for('static', filename='bower_components/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css', _external=True, stamp=stamp) }}"> + + <img src="{{ url_for('calender_icon', _external=True, stamp=stamp) }}" width="100" height="100" onclick="show_calendar()" align="left"> + <form style="position: absolute; right: 15%; width: 15%; height: 15%;"> <button type="button" id="logout_button" onclick="logout()" style="width: 100%; height: 100%;">logout</button> </form> @@ -28,7 +34,7 @@ <input id="username" type="text" name="name"> <input type="button" value="rename" onclick="renameUser()"> </form> - </p + </p> {% else %} Use your card/token to log in... {% endif %} -- 2.11.0

1 0

[PATCH mt-apps v3] Added list of scripts
by Tomas Prochazka 05 Sep '18

05 Sep '18

This scripts are are needed to create Dialog window with calendar --- html/index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/html/index.html b/html/index.html index 06f8fbf..6f16ee7 100644 --- a/html/index.html +++ b/html/index.html @@ -3,6 +3,11 @@ <head> <meta charset="utf-8"/> <title>IID Coffee Terminal</title> + +<script src="http://localhost:5000/jquery.min.js"> </script> +<script src="http://localhost:5000/bootstrap.min.js"> </script> +<script src="http://localhost:5000/bootstrap-dialog.min.js"> </script>  + <script> function loadServerScript() { let script = document.createElement('script'); -- 2.11.0

2 2

[PATCH coffee-flask v3] Add function for add events to callendar
by Tomas Prochazka 05 Sep '18

05 Sep '18

A replaced of paper calendar with operations related to the maintenance of a coffee shop --- .gitmodules | 15 ++++++ app.py | 51 +++++++++++++++++- coffee_db.py | 22 ++++++++ coffee_db.sql | 18 +++++++ templates/bower_components/bootstrap | 1 + templates/bower_components/bootstrap3-dialog | 1 + templates/bower_components/fullcalendar | 1 + templates/bower_components/jquery | 1 + templates/bower_components/moment | 1 + templates/calendar.html | 80 ++++++++++++++++++++++++++++ templates/calendar.svg | 51 ++++++++++++++++++ templates/events/box.svg | 68 +++++++++++++++++++++++ templates/events/machine.svg | 67 +++++++++++++++++++++++ templates/events/milk.svg | 68 +++++++++++++++++++++++ templates/events/milk_container.svg | 47 ++++++++++++++++ templates/main.js | 22 ++++++++ templates/user.html | 8 ++- 17 files changed, 519 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 templates/bower_components/bootstrap create mode 160000 templates/bower_components/bootstrap3-dialog create mode 160000 templates/bower_components/fullcalendar create mode 160000 templates/bower_components/jquery create mode 160000 templates/bower_components/moment create mode 100644 templates/calendar.html create mode 100644 templates/calendar.svg create mode 100644 templates/events/box.svg create mode 100644 templates/events/machine.svg create mode 100644 templates/events/milk.svg create mode 100644 templates/events/milk_container.svg diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3175491 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "templates/bower_components/jquery"] + path = templates/bower_components/jquery + url = https://github.com/jquery/jquery-dist.git +[submodule "templates/bower_components/bootstrap"] + path = templates/bower_components/bootstrap + url = https://github.com/twbs/bootstrap.git +[submodule "templates/bower_components/bootstrap3-dialog"] + path = templates/bower_components/bootstrap3-dialog + url = https://github.com/nakupanda/bootstrap3-dialog.git +[submodule "templates/bower_components/moment"] + path = templates/bower_components/moment + url = https://github.com/moment/moment +[submodule "templates/bower_components/fullcalendar"] + path = templates/bower_components/fullcalendar + url = https://github.com/fullcalendar/fullcalendar diff --git a/app.py b/app.py index 5481624..05a1994 100644 --- a/app.py +++ b/app.py @@ -1,4 +1,4 @@ -from flask import Flask, render_template, send_file, request, session, redirect, url_for, make_response +from flask import Flask, render_template, send_file, request, session, redirect, url_for, make_response, jsonify from flask_cors import CORS import numpy as np @@ -13,7 +13,7 @@ import time from datetime import date, timedelta db.init_db() -app = Flask(__name__) +app = Flask(__name__, static_url_path="", static_folder="templates") CORS(app, supports_credentials=True) app.secret_key = b'_5#y2L"F4Q8z\n\xec]/' @@ -163,6 +163,53 @@ def js(): response.headers['Content-Type'] = "text/javascript" return response +(a)app.route('/jquery.min.js') +def jquery_min_js(): + response = make_response(render_template("bower_components/jquery/dist/jquery.min.js")) + response.headers['Content-Type'] = "text/javascript" + return response + +(a)app.route('/bootstrap.min.js') +def bootstrap_min_js(): + response = make_response(render_template("bower_components/bootstrap/dist/js/bootstrap.min.js")) + response.headers['Content-Type'] = "text/javascript" + return response + +(a)app.route('/bootstrap-dialog.min.js') +def bootstrap_dialog_min_js(): + response = make_response(render_template("bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js")) + response.headers['Content-Type'] = "text/javascript" + return response + +(a)app.route("/events/<image>") +def event_icon(image): + print(image) + svg = open('templates/events/'+image).read() + response = make_response(svg) + response.content_type = 'image/svg+xml' + return response + +(a)app.route("/event/add", methods=["POST"]) +def event_add(): + if request.method == "POST": + json = request.json + db.add_event(json["time"], json["event"], json["uid"]) + return redirect(url_for('user')) + +(a)app.route("/event_list") +def event_list(): + return jsonify(db.list_event()) + +(a)app.route("/calendar.svg") +def calender_icon(): + svg = open('templates/calendar.svg').read() + response = make_response(svg) + response.content_type = 'image/svg+xml' + return response + +(a)app.route('/calendar') +def calendar(): + return render_template('calendar.html',events=db.events()) @app.route("/log", methods=["POST"]) def log(): diff --git a/coffee_db.py b/coffee_db.py index 0abb5a4..03bc15e 100644 --- a/coffee_db.py +++ b/coffee_db.py @@ -54,6 +54,28 @@ def add_coffee(uid, flavor, time=None): c.execute("insert into coffees (id, flavor, time) values (?,?,?)", (uid, flavor, time)) close_db(conn) +def add_event(time, title, uid): + conn, c = open_db() + c.execute("insert into events (time,title,id) values (?,?,?)", (time,title,uid)) + close_db(conn) + +def list_event(): + conn, c = open_db() + result=c.execute("select e.time, e.title, l.image from events e left join (select * from list_events) l on e.title=l.title") + items=[] + for row in result: + items.append({'start': row[0], 'color': '#FFFFFF', 'imageurl':row[2]}) + close_db(conn) + return items + +def events(): #various events that can be created + conn, c = open_db() + result=c.execute("select title, image from list_events") + items=[] + for row in result: + items.append({'title': row[0],'image': row[1]}) + close_db(conn) + return items def list_coffees(uid=None): c = conn.cursor() diff --git a/coffee_db.sql b/coffee_db.sql index d9f7d8e..63367d8 100644 --- a/coffee_db.sql +++ b/coffee_db.sql @@ -28,6 +28,24 @@ create table if not exists days ( num integer primary key not null ); +create table if not exists events ( + time datetime, + title varchar(255), + id varchar(24) references users(id) +); + +create table if not exists list_events ( + title varchar(255) primary key not null, + image varchar(255) +); + +insert or ignore into list_events values + ("Milk container cleaned", "milk_container.svg"), + ("Coffee machine cleaned", "machine.svg"), + ("Milk washed wipill","milk.svg"), + ("New coffee opened","box.svg") +; + insert or ignore into days values (0),(1),(2),(3),(4),(5),(6) ; diff --git a/templates/bower_components/bootstrap b/templates/bower_components/bootstrap new file mode 160000 index 0000000..0b9c4a4 --- /dev/null +++ b/templates/bower_components/bootstrap @@ -0,0 +1 @@ +Subproject commit 0b9c4a4007c44201dce9a6cc1a38407005c26c86 diff --git a/templates/bower_components/bootstrap3-dialog b/templates/bower_components/bootstrap3-dialog new file mode 160000 index 0000000..5304d56 --- /dev/null +++ b/templates/bower_components/bootstrap3-dialog @@ -0,0 +1 @@ +Subproject commit 5304d56cd33da77b8c8e6e250e8f39211d191a0e diff --git a/templates/bower_components/fullcalendar b/templates/bower_components/fullcalendar new file mode 160000 index 0000000..3ddb3c8 --- /dev/null +++ b/templates/bower_components/fullcalendar @@ -0,0 +1 @@ +Subproject commit 3ddb3c8d1461c6b841aed3487ba07d8ba338adb6 diff --git a/templates/bower_components/jquery b/templates/bower_components/jquery new file mode 160000 index 0000000..9e8ec3d --- /dev/null +++ b/templates/bower_components/jquery @@ -0,0 +1 @@ +Subproject commit 9e8ec3d10fad04748176144f108d7355662ae75e diff --git a/templates/bower_components/moment b/templates/bower_components/moment new file mode 160000 index 0000000..db71a65 --- /dev/null +++ b/templates/bower_components/moment @@ -0,0 +1 @@ +Subproject commit db71a655fc51fe58009675608a400d0d4cd0ca87 diff --git a/templates/calendar.html b/templates/calendar.html new file mode 100644 index 0000000..6951163 --- /dev/null +++ b/templates/calendar.html @@ -0,0 +1,80 @@ +<!DOCTYPE html> +<html> + +<head> + <meta charset='utf-8' /> + <link rel="stylesheet" href="{{ url_for('static', filename='bower_components/fullcalendar/dist/fullcalendar.min.css', _external=True, stamp=stamp) }}"> + <script type=text/javascript src="{{ url_for('static', filename='bower_components/moment/min/moment.min.js', _external=True, stamp=stamp) }}"></script> + <script type=text/javascript src="{{ url_for('static', filename='bower_components/jquery/dist/jquery.min.js', _external=True, stamp=stamp) }}"></script> + <script type=text/javascript src="{{ url_for('static', filename='bower_components/fullcalendar/dist/fullcalendar.min.js', _external=True, stamp=stamp) }}"></script> + <script type=text/javascript> + var calendar; + $(document).ready(function() { + calendar = $('#calendar').fullCalendar({ + header: { + left: 'prev,next today', + center: 'title', + right: '' + }, + selectable: true, + selectHelper: true, + selectConstraint: { + start: '00:00', + end: '24:00' + }, + events: { + url: "{{ url_for('event_list', _external=True, stamp=stamp) }}" + }, + eventRender: function(event, eventElement) { + if (event.imageurl) { + var variable1 = event.imageurl; + eventElement.find(".fc-title").html("<center> <img src={{ url_for('event_icon', image='var1', _external=True, stamp=stamp) }} width='20' height='20' /> </center>".replace("var1", variable1)); + } + } + }); + }); + </script> + <style> + body { + margin: 20px 10px; + padding: 0; + font-family: "Lucida Grande", Helvetica, Arial, Verdana, sans-serif; + font-size: 14px; + } + #calendar { + max-width: 800px; + margin: 0 auto; + } + fieldset { + font-size: 15px; + padding: 10px; + width: 450px; + margin: 0 auto; + text-align: center; + line-height: 1.8; + } + </style> + +</head> + +<body> + <center> + <h2> <b>Coffee machine cleaning </b></h2> + <h3> Write the operation performed by pressing the button in this dialog window in the lower part.</h3> + <form> + <b>Operations: </b> + {% for event in events %} + <img style="vertical-align:middle" src="{{ url_for('event_icon', image=event.image, _external=True, stamp=stamp )}}" width="40" height="40"> + <span style="">{{ event.title }}</span> + {% endfor %} + </form> + <div id='calendar'></div> + <form> + {% for event in events %} + <input type="button" value="{{ event.title }}" onclick="addEvent(this.value)"> + {% endfor %} + </form> + </center> +</body> + +</html> diff --git a/templates/calendar.svg b/templates/calendar.svg new file mode 100644 index 0000000..4d781eb --- /dev/null +++ b/templates/calendar.svg @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> + +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#77B3D4;} + .st1{opacity:0.2;} + .st2{fill:#231F20;} + .st3{fill:#FFFFFF;} + .st4{fill:#C75C5C;} + .st5{fill:#4F5D73;} + .st6{fill:#E0E0D1;} +</style> +<g id="Layer_1"> + <g> + <circle class="st0" cx="32" cy="32" r="32"/> + </g> + <g> + <g class="st1"> + <path class="st2" d="M12,25v25c0,2.2,1.8,4,4,4h32c2.2,0,4-1.8,4-4V25H12z"/> + </g> + <g> + <path class="st3" d="M12,23v25c0,2.2,1.8,4,4,4h32c2.2,0,4-1.8,4-4V23H12z"/> + </g> + <g class="st1"> + <path class="st2" d="M48,14H16c-2.2,0-4,1.8-4,4v7h40v-7C52,15.8,50.2,14,48,14z"/> + </g> + <g> + <path class="st4" d="M48,12H16c-2.2,0-4,1.8-4,4v7h40v-7C52,13.8,50.2,12,48,12z"/> + </g> + <g> + <path class="st5" d="M32,48c-1.1,0-2-0.9-2-2c0-5.5,1.8-9.5,3.5-12H27c-1.1,0-2-0.9-2-2s0.9-2,2-2h11c0.9,0,1.6,0.6,1.9,1.4 + s0,1.7-0.7,2.2C39,33.8,34,37.5,34,46C34,47.1,33.1,48,32,48z"/> + </g> + <g class="st1"> + <path class="st2" d="M20,21c-1.1,0-2-0.9-2-2v-7c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2v7C22,20.1,21.1,21,20,21L20,21z"/> + </g> + <g class="st1"> + <path class="st2" d="M45,21c-1.1,0-2-0.9-2-2v-7c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2v7C47,20.1,46.1,21,45,21L45,21z"/> + </g> + <g> + <path class="st6" d="M20,19c-1.1,0-2-0.9-2-2v-7c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2v7C22,18.1,21.1,19,20,19L20,19z"/> + </g> + <g> + <path class="st6" d="M45,19c-1.1,0-2-0.9-2-2v-7c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2v7C47,18.1,46.1,19,45,19L45,19z"/> + </g> + </g> +</g> +<g id="Layer_2"> +</g> +</svg> diff --git a/templates/events/box.svg b/templates/events/box.svg new file mode 100644 index 0000000..2bcbbf1 --- /dev/null +++ b/templates/events/box.svg @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg8" + version="1.1" + viewBox="0 0 35.000072 35.000072" + height="35.000072mm" + width="35.000072mm" + sodipodi:docname="box.svg" + inkscape:version="0.92.1 r15371"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1016" + id="namedview9" + showgrid="false" + inkscape:zoom="1.7840439" + inkscape:cx="-44.841946" + inkscape:cy="65.020819" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:22.57777786px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#c49347;fill-opacity:1;stroke:none;stroke-width:0.26458332;" + x="7.6817751" + y="25.313768" + id="text4487"><tspan + id="tspan4485" + x="7.6817751" + y="25.313768" + style="font-size:22.57777786px;fill:#c49347;fill-opacity:1;stroke-width:0.26458332;">N</tspan></text> + <rect + style="opacity:0.98999999;fill:none;fill-opacity:1;stroke:#c49347;stroke-width:2.39791874;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4505" + width="32.602345" + height="32.602345" + x="1.1988993" + y="1.198831" /> +</svg> diff --git a/templates/events/machine.svg b/templates/events/machine.svg new file mode 100644 index 0000000..2d2e606 --- /dev/null +++ b/templates/events/machine.svg @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg8" + version="1.1" + viewBox="0 0 35.000072 35.000072" + height="35.000072mm" + width="35.000072mm" + sodipodi:docname="machine.svg" + inkscape:version="0.92.1 r15371"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1016" + id="namedview9" + showgrid="false" + inkscape:zoom="1.7840439" + inkscape:cx="-47.084043" + inkscape:cy="66.141869" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:22.57777786px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#47c779;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="8.9252768" + y="25.313768" + id="text4487"><tspan + id="tspan4485" + x="8.9252768" + y="25.313768" + style="font-size:22.57777786px;fill:#47c779;fill-opacity:1;stroke-width:0.26458332">C</tspan></text> + <circle + style="opacity:0.98999999;fill:none;fill-opacity:1;stroke:#47c779;stroke-width:2.04399991;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path4489" + cx="17.500038" + cy="17.500036" + r="16.478037" /> +</svg> diff --git a/templates/events/milk.svg b/templates/events/milk.svg new file mode 100644 index 0000000..eb7c51e --- /dev/null +++ b/templates/events/milk.svg @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg8" + version="1.1" + viewBox="0 0 35.000072 35.000072" + height="35.000072mm" + width="35.000072mm" + sodipodi:docname="milk.svg" + inkscape:version="0.92.1 r15371"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1016" + id="namedview9" + showgrid="false" + inkscape:zoom="1.7840439" + inkscape:cx="67.262918" + inkscape:cy="66.141869" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:22.57777786px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0000c8;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="7.6817751" + y="25.313768" + id="text4487"><tspan + id="tspan4485" + x="7.6817751" + y="25.313768" + style="font-size:22.57777786px;fill:#0000c8;fill-opacity:1;stroke-width:0.26458332">M</tspan></text> + <rect + style="opacity:0.98999999;fill:none;fill-opacity:1;stroke:#0000c8;stroke-width:2.39779854;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4505" + width="32.602345" + height="32.602345" + x="1.1988993" + y="1.198831" /> +</svg> diff --git a/templates/events/milk_container.svg b/templates/events/milk_container.svg new file mode 100644 index 0000000..b31f75e --- /dev/null +++ b/templates/events/milk_container.svg @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + id="svg8" + version="1.1" + viewBox="0 0 35.000072 35.000072" + height="35.000072mm" + width="35.000072mm"> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + transform="translate(-23.989663,-42.769872)" + id="layer1"> + <text + id="text4487" + y="68.083641" + x="31.671438" + style="font-style:normal;font-weight:normal;font-size:22.57777786px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + xml:space="preserve"><tspan + style="font-size:22.57777786px;fill:#ff0000;stroke-width:0.26458332" + y="68.083641" + x="31.671438" + id="tspan4485">M</tspan></text> + <circle + r="16.478037" + cy="60.269909" + cx="41.4897" + id="path4489" + style="opacity:0.98999999;fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:2.04399991;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> +</svg> diff --git a/templates/main.js b/templates/main.js index 8135983..c3ea61e 100644 --- a/templates/main.js +++ b/templates/main.js @@ -7,6 +7,7 @@ var timeToLogout = undefined; // defined during logout countdown var logoutTimer; var reloadTimer = undefined; var id_user; // ID of the user who is to be accounted for the next coffee +var dialog; console.log("hello from flask"); //sendJSON("{\"type\":\"empty\"}"); @@ -155,8 +156,17 @@ function login(id) { countingTimeLogout(120); } +function show_calendar(){ + var url="{{ url_for('calendar', _external=True, stamp=stamp) }}"; + dialog=BootstrapDialog.show({ + title: 'Calendar', + message: $('<div></div>').load(url) + }); +} + function logout() { sendReset(); + dialog.close(); ajax("GET", "logout", "", "user"); id_user = undefined; timeToLogout = undefined; @@ -202,6 +212,18 @@ function addCoffee(flavor, time = new Date()) { } } +function addEvent(event, time = new Date()) { + var data = JSON.stringify({ + time: time.toISOString().split("T")[0], + event: event, + uid: id_user + }); + if (id_user) { + ajax("POST", "event/add", data, ""); + dialog.close(); + } +} + function sendLog(json) { ajax("POST", "log", json, "log"); } diff --git a/templates/user.html b/templates/user.html index 95ee95e..4b31077 100644 --- a/templates/user.html +++ b/templates/user.html @@ -1,4 +1,10 @@ {% if name %} + + <link rel="stylesheet" href="{{ url_for('static', filename='bower_components/bootstrap/dist/css/bootstrap.min.css', _external=True, stamp=stamp) }}"> + <link rel="stylesheet" href="{{ url_for('static', filename='bower_components/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css', _external=True, stamp=stamp) }}"> + + <img src="{{ url_for('calender_icon', _external=True, stamp=stamp) }}" width="100" height="100" onclick="show_calendar()" align="left"> + <form style="position: absolute; right: 15%; width: 15%; height: 15%;"> <button type="button" id="logout_button" onclick="logout()" style="width: 100%; height: 100%;">logout</button> </form> @@ -28,7 +34,7 @@ <input id="username" type="text" name="name"> <input type="button" value="rename" onclick="renameUser()"> </form> - </p + </p> {% else %} Use your card/token to log in... {% endif %} -- 2.11.0

2 1

[Bug - spatny zaznam casu]
by Tomas 05 Sep '18

05 Sep '18

Pri ukladani dat (udelani si kavy) dochazi k posunutemu zaznamu casu a to o 2 hodiny zpet

2 1

[PATCH coffee-flask] Fix coffee graph for start of the month
by Jaroslav Klapalek 03 Sep '18

03 Sep '18

An error was found during the start of new month. To fix this I have changed the SQL query to use '%s' (unix time) instead of '%d' (day number). How does this work? The SQL query is using relation between two tables based on the date. This relation is created using these parts of query: > "select num,date('now',-num || ' days')" as d from days > d = date(c.time) First line creates timestampes of last 7 days -- time is set to UTC midnight. Second line converts data in 'c.time' to date struct - BUT! Even here the time is set to midnight. This behaviour makes the relation possible. How does it behave in app.py? Result of the query contains data that are ordered by time. Unfortunately this order is lost during recasting the data to list/dict (which are unordered). To solve this sorting is used. Sorting data with unix time is safe, because it is always increasing. To highlight this change, 'days' variable is refactored to 'unix_days'. --- app.py | 14 +++++++------- coffee_db.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app.py b/app.py index 5481624..807f614 100644 --- a/app.py +++ b/app.py @@ -93,21 +93,21 @@ def coffee_graph_history(): else: hist = db.coffee_history() if hist == []: - days = tuple() + unix_days = tuple() counts = tuple() flavors = tuple() else: - days, counts, flavors = zip(*hist) + unix_days, counts, flavors = zip(*hist) fig = plt.figure(figsize=(4, 3)) ax = fig.add_subplot(111) list_flavor = sorted(db.flavors()) l = [{} for i in range(len(list_flavor))] for ll in l: - for d in days: + for d in unix_days: ll[d] = 0 - for(d, c, f) in zip(days, counts, flavors): + for(d, c, f) in zip(unix_days, counts, flavors): if f is None: continue what_f = 0 @@ -125,13 +125,13 @@ def coffee_graph_history(): ax.bar(range(len(x)), y, bottom=z) z = [sum(i) for i in zip(y, z)] - days = set(days) + unix_days = set(unix_days) xdays = [i.strftime("%a") for i in [ date.today() - timedelta(j - 1) for j in - range(len(days), 0, -1)]] + range(len(unix_days), 0, -1)]] xdays[-1] = "TDY" xdays[-2] = "YDA" - ax.set_xticks(range(len(days))) + ax.set_xticks(range(len(unix_days))) ax.set_xticklabels(xdays) ax.set_title("Your week") ax.yaxis.set_major_locator(MaxNLocator(integer=True)) diff --git a/coffee_db.py b/coffee_db.py index 0abb5a4..8c18e63 100644 --- a/coffee_db.py +++ b/coffee_db.py @@ -95,7 +95,7 @@ def coffee_history(uid=None): if uid is None: res = list(c.execute(""" - select strftime('%d', ds.d),count(c.flavor),c.flavor from + select strftime('%s', ds.d),count(c.flavor),c.flavor from (select num,date('now',-num || ' days') as d from days) ds left join coffees c on d = date(c.time) group by d, c.flavor @@ -103,7 +103,7 @@ def coffee_history(uid=None): else: res = list(c.execute( """ - select strftime('%d', ds.d),count(c.flavor),c.flavor from + select strftime('%s', ds.d),count(c.flavor),c.flavor from (select num,date('now',-num || ' days') as d from days) ds left join (select time,flavor from coffees where id = ?) c -- 2.7.4

2 1

Re: [Coffee] [PATCH coffee-flask] Fix coffee graph for start of the month
by Michal Sojka 03 Sep '18

03 Sep '18

Dík. Na první pohled se zdá, že to problém opravdu řeší, ale okomentuj to prosím trochu v "commit message" - v čem je problém a jak ho to vyřeší. Zdá se, že číslo dne nahrazuješ počtem sekund, ale není mi jasné proč to funguje ve funkci coffee_graph_history(). Tam se výsledek z databáze rozděluje do proměnných days, counts a flavors. Proměnná "days" má teď tedy zavádějící název - měla by se to přejmenovat na seconds nebo secs_since_epoch. Ale asi se někde v kódu ty sekundy převedou na dny, protože graf je správně, ale já to tam nevidím. Můžeš upravit i kód coffee_graph_history, aby to tam bylo vidět a poslat 2. verzi patche? -Michal On Mon, Sep 03 2018, Klapalek, Jaroslav wrote: > --- > coffee_db.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/coffee_db.py b/coffee_db.py > index 0abb5a4..8c18e63 100644 > --- a/coffee_db.py > +++ b/coffee_db.py > @@ -95,7 +95,7 @@ def coffee_history(uid=None): > > if uid is None: > res = list(c.execute(""" > - select strftime('%d', ds.d),count(c.flavor),c.flavor from > + select strftime('%s', ds.d),count(c.flavor),c.flavor from > (select num,date('now',-num || ' days') as d from days) ds > left join coffees c > on d = date(c.time) group by d, c.flavor > @@ -103,7 +103,7 @@ def coffee_history(uid=None): > else: > res = list(c.execute( > """ > - select strftime('%d', ds.d),count(c.flavor),c.flavor from > + select strftime('%s', ds.d),count(c.flavor),c.flavor from > (select num,date('now',-num || ' days') as d from days) ds > left join > (select time,flavor from coffees where id = ?) c > -- > 2.7.4 > > > _______________________________________________ > Coffee mailing list > Coffee(a)rtime.felk.cvut.cz > https://rtime.felk.cvut.cz/mailman/listinfo/coffee

1 0

[PATCH coffee-flask] Fix coffee graph for start of the month
by Jaroslav Klapalek 03 Sep '18

03 Sep '18

--- coffee_db.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coffee_db.py b/coffee_db.py index 0abb5a4..8c18e63 100644 --- a/coffee_db.py +++ b/coffee_db.py @@ -95,7 +95,7 @@ def coffee_history(uid=None): if uid is None: res = list(c.execute(""" - select strftime('%d', ds.d),count(c.flavor),c.flavor from + select strftime('%s', ds.d),count(c.flavor),c.flavor from (select num,date('now',-num || ' days') as d from days) ds left join coffees c on d = date(c.time) group by d, c.flavor @@ -103,7 +103,7 @@ def coffee_history(uid=None): else: res = list(c.execute( """ - select strftime('%d', ds.d),count(c.flavor),c.flavor from + select strftime('%s', ds.d),count(c.flavor),c.flavor from (select num,date('now',-num || ' days') as d from days) ds left join (select time,flavor from coffees where id = ?) c -- 2.7.4

1 0

2024

2023

2022

2021

2020

2019

2018

Coffee