Merge branch 'master' of ssh://git.zeus.gent:2222/kelder/rubygoldberg-tracker

This commit is contained in:
Hannes Klinckaert 2019-09-20 17:02:13 +02:00
commit 4c282bc16b
3 changed files with 23 additions and 4 deletions

8
client_ideas.md Normal file
View file

@ -0,0 +1,8 @@
- morse sound + microfoon
- qr code -> 1 camera en een scherm
- file upload via tfp + file watcher
- ?? excel file ??
- simple http request or netcat
- licht sensor
- andere sensors (vochtigheid, ...)

View file

@ -35,7 +35,11 @@ def link_start(run, index):
if db["current_run"] != run: if db["current_run"] != run:
return "Wrong run number, you are probably behind.", 404 return "Wrong run number, you are probably behind.", 404
else: else:
db["run_data"][run]["data"][index]["start"] = datetime.datetime.now() link_data = db["run_data"][run]["data"][index]
if link_data["start"]:
return "you already started in this run. Ignoring this request."
else:
link_data["start"] = datetime.datetime.now()
return "Success." return "Success."
@ -44,7 +48,11 @@ def link_handoff(run, index):
if db["current_run"] != run: if db["current_run"] != run:
return "Wrong run number, you are probably behind.", 404 return "Wrong run number, you are probably behind.", 404
else: else:
db["run_data"][run]["data"][index]["handoff"] = datetime.datetime.now() link_data = db["run_data"][run]["data"][index]
if link_data["handoff"]:
return "you already handed off control during this run. Ignoring this request"
else:
link_data["handoff"] = datetime.datetime.now()
return "Success." return "Success."

3
watcher/static/index.js Normal file
View file

@ -0,0 +1,3 @@
const io = require('socket.io-client');
// or with import syntax
import io from 'socket.io-client';