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

[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

Test
by Michal Sojka 02 Sep '18

02 Sep '18

xxx

1 0

Re: [Coffee] [PATCH v2] Add function for showing offline calendar
by Michal Sojka 02 Sep '18

02 Sep '18

Ahoj Tomáši, jak už jsem psal, nemyslím si, že je potřeba mít tuto funkcionalitu offline. Mám pro to následující důvody: - Beru to tak, že události zaznamenávané do kalendáře nejsou kritické (nejde o prachy), takže pokud to tu a tam nebude fungovat, nic moc se nestane. - Offline režim je schválně dělán jako minimalistický a toto z něj dělá režim maximalistický (viz níže). - Bylo by potřeba dodělat do buildrootu (terminal/src/buildroot/package/merica/mt-apps/mt-apps.mk) instalaci všech souborů v adresáři html. - Tím by se na terminál nainstalovalo 29 MB šrotu, což docela hodně (asi 500x víc, než je současná velikost všech zdrojáků). Při instalaci jen dist/ souborů je to jen 6 MB, ale i to je docela dost. - Při jakékoli změně v těchto souborech (a proto, že to je tolik dat, tak i těch změn určitě nebude málo) by se musela updatovat data na SD kartě terminálu. Ne, že by to nešlo, ale na terminálu je jen minimální instalace Linuxu, takže je to zbytečný "vopruz". - V současném kódu je off-line and on-line funkcionalita dost propletena a je to hodně nepřehledné. Myslím, že kalendář by mohl být klidně načten ze serveru a pokud server na nějakou dobu vypadne, mohl by fungovat i chvíli bez něj. Ale není potřeba, aby byl kalendář k dispozici hned po naběhnutí terminálu i bez serveru. Další komentáře posílám v kódu níže. On Fri, Aug 31 2018, Prochazka, Tomas wrote: > This commit implementing function for add events as 'Milk clean' to > calendar. Calendar is running offline, so not need any data for create > calendar from server. > > Every user sees events, which created another users (this events are > displayed 'red' color ), but only user which created events(other > color) he can edit it(delete). If user wants to create event, he must > be logged in. After logging in, it will be displayed image with > calendar. > --- > .gitmodules | 15 +++ > html/bower_components/bootstrap | 1 + > html/bower_components/bootstrap3-dialog | 1 + > html/bower_components/fullcalendar | 1 + > html/bower_components/jquery | 1 + > html/bower_components/moment | 1 + > html/calendar.html | 211 ++++++++++++++++++++++++++++++++ > html/calendar.svg | 51 ++++++++ > html/index.html | 37 +++++- > 9 files changed, 317 insertions(+), 2 deletions(-) > create mode 160000 html/bower_components/bootstrap > create mode 160000 html/bower_components/bootstrap3-dialog > create mode 160000 html/bower_components/fullcalendar > create mode 160000 html/bower_components/jquery > create mode 160000 html/bower_components/moment > create mode 100644 html/calendar.html > create mode 100644 html/calendar.svg > > diff --git a/.gitmodules b/.gitmodules > index 56c12ef..7850202 100644 > --- a/.gitmodules > +++ b/.gitmodules > @@ -1,3 +1,18 @@ > [submodule "libwebsockets"] > path = libwebsockets > url = https://github.com/warmcat/libwebsockets.git > +[submodule "html/bower_components/jquery"] > + path = html/bower_components/jquery > + url = https://github.com/jquery/jquery-dist.git > +[submodule "html/bower_components/bootstrap"] > + path = html/bower_components/bootstrap > + url = https://github.com/twbs/bootstrap.git > +[submodule "html/bower_components/bootstrap3-dialog"] > + path = html/bower_components/bootstrap3-dialog > + url = https://github.com/nakupanda/bootstrap3-dialog.git > +[submodule "html/bower_components/moment"] > + path = html/bower_components/moment > + url = https://github.com/moment/moment > +[submodule "html/bower_components/fullcalendar"] > + path = html/bower_components/fullcalendar > + url = https://github.com/fullcalendar/fullcalendar > diff --git a/html/bower_components/bootstrap b/html/bower_components/bootstrap > new file mode 160000 > index 0000000..0b9c4a4 > --- /dev/null > +++ b/html/bower_components/bootstrap > @@ -0,0 +1 @@ > +Subproject commit 0b9c4a4007c44201dce9a6cc1a38407005c26c86 > diff --git a/html/bower_components/bootstrap3-dialog b/html/bower_components/bootstrap3-dialog > new file mode 160000 > index 0000000..3dd11d5 > --- /dev/null > +++ b/html/bower_components/bootstrap3-dialog > @@ -0,0 +1 @@ > +Subproject commit 3dd11d586f78de75356af418907ec6e3b347377c > diff --git a/html/bower_components/fullcalendar b/html/bower_components/fullcalendar > new file mode 160000 > index 0000000..3ddb3c8 > --- /dev/null > +++ b/html/bower_components/fullcalendar > @@ -0,0 +1 @@ > +Subproject commit 3ddb3c8d1461c6b841aed3487ba07d8ba338adb6 > diff --git a/html/bower_components/jquery b/html/bower_components/jquery > new file mode 160000 > index 0000000..9e8ec3d > --- /dev/null > +++ b/html/bower_components/jquery > @@ -0,0 +1 @@ > +Subproject commit 9e8ec3d10fad04748176144f108d7355662ae75e > diff --git a/html/bower_components/moment b/html/bower_components/moment > new file mode 160000 > index 0000000..db71a65 > --- /dev/null > +++ b/html/bower_components/moment > @@ -0,0 +1 @@ > +Subproject commit db71a655fc51fe58009675608a400d0d4cd0ca87 > diff --git a/html/calendar.html b/html/calendar.html > new file mode 100644 > index 0000000..5c21b19 > --- /dev/null > +++ b/html/calendar.html > @@ -0,0 +1,211 @@ > +<!DOCTYPE html> > +<html> > + > +<head> > + <meta charset='utf-8' /> > + <link href='bower_components/fullcalendar/dist/fullcalendar.min.css' rel='stylesheet' /> > + <link href='bower_components/fullcalendar/dist/fullcalendar.print.min.css' rel='stylesheet' media='print' /> > + <script src='bower_components/moment/min/moment.min.js'></script> > + <script src='bower_components/jquery/dist/jquery.min.js'></script> > + <script src='bower_components/fullcalendar/dist/fullcalendar.min.js'></script> > + <script> > + var color_event = '#FF0000'; //color for events, which user can not edit Lepší by bylo pojmenovat tu proměnnou event_color_ro (jako read only). Ale nevím, jestli je dobré ji definovat jako globální proměnnou - může se tlouct o jméno s jinými skripty (čert ví, co v těch 29 MB všecho je :-). Nebyla by lepší definice v css? > + var Object_services = [{ > + id: "clean_milk", > + name: "Clean milk", Milk container cleaned > > + color: '#178006' > + }, { > + id: "open_new_box", > + name: "Open new box", New coffee opened > + color: '#062e80' > + }, { > + id: "last_coffee_box", > + name: "Last coffee box", Tohle má znamenat co? Že někdo načal poslední pytel kafe? Není jasné, jestli se v takovém případě má zaškrtnout i předchozí možnost nebo ne. Viz také níže. > + color: '#862e80' > + }]; Chybí tu Např. čištění celého kávovaru (ne jen piksly na mléko). > + > + function settingRightVariables() { > + document.getElementById("id1").id = String(Object_services[0].id); > + document.getElementById("id1_label").textContent = String(Object_services[0].name); > + document.getElementById("id2").id = String(Object_services[1].id); > + document.getElementById("id2_label").textContent = String(Object_services[1].name); > + document.getElementById("id3").id = String(Object_services[2].id); > + document.getElementById("id3_label").textContent = String(Object_services[2].name); > + } Proč to nastavuješ pomocí skriptu? Když ty id a textContent nastavíš rovnou v html dole, tak to bude kratší a přehlednější. > + 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' > + }, > + select: function(start, end) { > + var array = $('#calendar').fullCalendar('clientEvents', function(events) { > + return (moment(events.start).format('YYYY-MM-DD') >= moment(start).format('YYYY-MM-DD') && moment(end).format('YYYY-MM-DD') > moment(events.start).format('YYYY-MM-DD')) Tohle rozděl na víc řádků, ať se to dá pochopit i bez scrolování. A není mi jasné to porovnání endu ze startem. Nevybereš tím všechny události v budoucnosti? > + }); > + var date_start = moment(start).format('YYYY-MM-DD'); > + var date_end = moment(end).format('YYYY-MM-DD'); Když tyhle proměnné nadefinuješ před array, tak ten kód funkce bude kratší a přehlednější. > + var i; > + for (i = 0; i < Object_services.length; i++) { > + var checkBox = document.getElementById(String(Object_services[i].id)); > + var foundValue = array.filter(obj => obj.title === Object_services[i].name); > + var title; > + if (checkBox.checked == true) { > + var title = String(Object_services[i].name); > + if (foundValue.length == 0) { > + var eventData; > + eventData = { > + title: title, > + start: start, > + color: Object_services[i].color > + }; > + $('#calendar').fullCalendar('renderEvent', eventData, true); // stick? = true > + let queue = JSON.parse(localStorage.getItem("events_local")) || []; > + var id = localStorage.getItem("id_local"); > + queue.push({ > + data: JSON.stringify({ > + type: "events", > + time: date_start, > + title: title, > + id: id, > + delete_events: false > + }) > + }); > + localStorage.setItem("events_local", JSON.stringify(queue)); > + } > + } > + } Tohle je dost divoké. Mám následující připomínky: 1) Přidávání událostí není moc intuitivní. Člověk neví, jestli má nejdřív kliknout do kalendáře a pak vybrat "Service", nebo naopak. Chtělo by to napsat uživateli, co a jak má dělat. Ale... 2) Přidávání událostí pomocí kalendáře je zbytečné či možná dokonce nežádoucí. Když vyčistím kávovar, tak chci kliknout, že jsem vyčistil kávovar a nechci klikat na datum, protože budu vždy klikat na dnešek. Čili, kalendář bych použil jen na zobrazování událostí, přidávání bych dělal jen stiskem jednoho tlačítka. > + $('#calendar').fullCalendar('unselect'); > + }, > + eventClick: function(event) { > + if (event.editable) { > + var answer = confirm("Are you want remove this events (" + event.title + ") from " + moment(event.start).format('DD-MM-YYYY') + " ?") Mazání nějak blbnw. Když si naklikám víc událostí v různých dnes a pak je zkouším smazat, tak to občas nefunguje - ani se nezobrazí tato otázka. > + if (answer) { > + $('#calendar').fullCalendar('removeEvents', event._id); > + var id = localStorage.getItem("id_local"); > + let queue = JSON.parse(localStorage.getItem("events_local")) || []; > + queue.push({ > + data: JSON.stringify({ > + type: "events", > + time: moment(event.start).format('YYYY-MM-DD'), > + title: event.title, > + id: id, > + delete_events: true > + }) > + }); Tohle je taky nějaký divoký. Když chceš smazat událost, tak ji tam přidáš ještě jednou, ale nastavíš flag na true a odstraníš jí při druhém průchodu? Nemůžeš jí odstranit rovnou bez toho flagu delete_events? > + let queue2 = []; > + if (Array.isArray(queue)) { > + for (var i = queue.length - 1; i >= 0; i--) { Proč se to prochází pozpátku? Bude pak dobře fungovat mazání zprávy ze serveru, když smažu > + let entry = queue[i]; > + let entry2 = JSON.parse(entry.data); > + if (!((moment(event.start).format('YYYY-MM-DD') == entry2.time) && (event.title == entry2.title))) { > + queue2.push(entry); > + } else { > + entry2.delete_events = true; > + queue2.push({ > + data: JSON.stringify(entry2) //if server offline, we must event remove from localStorage > + }); > + } > + } > + localStorage.removeItem("events_local"); > + localStorage.setItem("events_local", JSON.stringify(queue2)); > + } Aha, už to chápu, to je asi kvůli tomu, že to potřebuješ odstranit i ze serveru. Ale stejně je to divoký. Kdyby se třeba časem přidávala událost, která může nastat víckrát za den, tak se to bude muset celé předělat. Další důvod pro to, nemít kalendář offline. Takhle se bojím, že v té synchronizaci local storage a serveru budou chyby. > + } > + } > + }, > + //editable: false, > + eventLimit: true > + }); > + > + let queue = JSON.parse(localStorage.getItem("events_server")) || []; //event from server Kdo nastavuje events_server? Nikde jinde to nevidím. Pokud to jsou události, které pošle flask, tak není důvod na to používat localStorage. Kód pro přidávání událostí ze serveru může být celý na serveru. > + localStorage.removeItem("events_server"); > + var id = localStorage.getItem("id_local"); //how user is login > + if (Array.isArray(queue)) { > + if (queue.length) { > + for (var i = queue.length - 1; i >= 0; i--) { Proč iteruješ pozpátku? > + let entry = queue[i]; > + addEventstoCalendar(id, entry); > + } > + } else { > + let queue = JSON.parse(localStorage.getItem("events_local")) || []; //event from local > + if (Array.isArray(queue)) { > + for (var i = queue.length - 1; i >= 0; i--) { > + let entry = queue[i]; > + entry = JSON.parse(entry.data); > + if (!entry.delete_events) { > + addEventstoCalendar(id, entry); > + } > + } > + } > + } > + } > + > + }); > + > + function addEventstoCalendar(id, entry) { > + var color = color_event; > + var eventData = { > + title: entry.title, > + start: entry.time, > + color: color, > + editable: false > + }; > + if (id == entry.id) { > + for (var j = 0; j < Object_services.length; j++) { > + if (entry.title == String(Object_services[j].name)) { > + eventData.color = Object_services[j].color; > + break; > + } > + } > + eventData.editable = true; > + } > + calendar.fullCalendar('renderEvent', eventData, true); > + } > + </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> > + <div id='calendar'></div> > + <script> > + settingRightVariables(); > + </script> > + <fieldset style="text-align:center"> > + <legend align="center"> Services</legend> > + <input style="vertical-align:middle" type="checkbox" id="id1"> > + <label style="vertical-align:middle" id="id1_label">A</label> > + <input style="vertical-align:middle" type="checkbox" id="id2"> > + <label style="vertical-align:middle" id="id2_label">B</label> > + <input style="vertical-align:middle" type="checkbox" id="id3"> > + <label style="vertical-align:middle" id="id3_label">C</label> > + </fieldset> > +</body> > + > +</html> > diff --git a/html/calendar.svg b/html/calendar.svg > new file mode 100644 > index 0000000..4d781eb > --- /dev/null > +++ b/html/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/html/index.html b/html/index.html > index 06f8fbf..b7e0122 100644 > --- a/html/index.html > +++ b/html/index.html > @@ -1,6 +1,13 @@ > <!doctype html> > <html> > <head> > + > +<script src="/bower_components/jquery/dist/jquery.min.js"></script> > +<link href="/bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/> > +<script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script> > +<link href="/bower_components/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css" rel="stylesheet" type="text/css" /> > +<script src="/bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js"></script> > + > <meta charset="utf-8"/> > <title>IID Coffee Terminal</title> > <script> > @@ -17,6 +24,7 @@ > loadServerScript(); > > var socket; > + var dialog; > > function showOfflineQueue() { > let queue = JSON.parse(localStorage.getItem("offlineQueue")) || []; > @@ -51,6 +59,16 @@ > > socket.onmessage = function(msg) { > updateJSONmsg(msg.data); > + var data = JSON.parse(msg.data); > + if (data.uid !== undefined) { //login > + localStorage.removeItem("id_local"); > + localStorage.setItem("id_local",data.uid); //save id > + console.log(data.uid); > + document.getElementById("myImg").style.visibility='visible'; //show Image for using Calendar > + }else{ > + dialog.close(); > + document.getElementById("myImg").style.visibility='hidden'; > + } > if (typeof updateRemote === "function") { > updateRemote(msg.data); > } else { > @@ -98,6 +116,7 @@ > } > > function sendReset() { > + document.getElementById("myImg").style.visibility='hidden'; > socket.send("reset"); > console.log("reset"); > } > @@ -106,13 +125,25 @@ > socket.send("close"); > console.log("close"); > } > + > + function show_calendar() { > + if (typeof updateRemote === "function") { > + replayOfflineEvents(); > + listEventst(); > + } > + dialog=BootstrapDialog.show({ > + title: 'Calendar', > + message: $('<div></div>').load('calendar.html') > + }); > + } > + > </script> > </head> > <body> > <center> > <h1>IID Coffee Terminal</h1> > </center> > - > + <img id="myImg" src="calendar.svg" width="100" height="100" align="left" onclick="show_calendar()"> > <div id="remote"></div> > > <div id="local"> > @@ -138,6 +169,8 @@ > <p>Input: <span id="inputStatus"></span>, JSON message: <span id="localJSON">no data received</span></p> > </center> > </div> > - > +<script> > + document.getElementById("myImg").style.visibility='hidden'; > +</script> > </body> > </html> > -- > 2.11.0

1 0