From a98a5aca95d23f9a3e3960ddbbf313c53c43f206 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 2 Dec 2022 15:23:20 +0100 Subject: [PATCH 001/126] stuff --- main.py | 12 +++++++----- picker.py | 17 +++++++++++++++-- upload/README.md | 2 ++ 3 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 upload/README.md diff --git a/main.py b/main.py index c1df801..aceb99b 100644 --- a/main.py +++ b/main.py @@ -35,28 +35,28 @@ def uptime(): #log system def log_server(log): - log = date + log + log = date + " " + log datei = open('server.log', 'a') datei.write('\n' + " " + log) log = date datei.close() def error_log(error): - error = date + " [ERROR]"+ error + error = date + " [ERROR] " + error datei = open('server.log', 'a') datei.write('\n' + " " + error) log = date datei.close() def problem_log(problem): - problem = date + " [PROBLEM]"+ problem + problem = date + " [PROBLEM] "+ problem datei = open('server.log', 'a') datei.write('\n' + " " + problem) log = date datei.close() def warning_log(warning): - warning = date + " [WARNING]"+ warning + warning = date + " [WARNING] "+ warning datei = open('server.log', 'a') datei.write('\n' + " " + warning) log = date @@ -172,7 +172,9 @@ def session(id): con = sqlite3.connect("party.db") warning_log("Verbindung mit Datenbank wurde aufgenommen /seession") cur = con.cursor() - mate = cur.execute("SELECT matename, mateanzahl FROM mate WHERE sessionID = \'{id}\';").fetchall() + l = f"SELECT matename, mateanzahl FROM mate WHERE sessionID = \'{id}\' ORDER BY mateanzahl;" + mate = cur.execute(l).fetchall() + con.commit() cur.close() con = sqlite3.connect("party.db") diff --git a/picker.py b/picker.py index cc27149..fe02ea5 100644 --- a/picker.py +++ b/picker.py @@ -1,4 +1,17 @@ import shutil, os +import sqlite3 -def picker(): - datei = open('server.log', 'a') \ No newline at end of file +def dbcon(): + print ("test") + +def tmbr(): + print("tomb raider datei") + +def nfsu2(): + print("nfsu2 datei") + +def anno1602(): + print("Anno 1602 datei") + +def picker(gamefile, sessionID, SpielerID): + datei = open(gamefile, 'a') \ No newline at end of file diff --git a/upload/README.md b/upload/README.md new file mode 100644 index 0000000..afcf4db --- /dev/null +++ b/upload/README.md @@ -0,0 +1,2 @@ +Hier ist Platz für Spiele Dateien +Lade sie in deiner Session einfach über den Upload Button hoch! \ No newline at end of file From 9ce6678b395ba06a9f0752371fb0d84910a4de26 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 2 Dec 2022 19:41:41 +0100 Subject: [PATCH 002/126] mate_logic --- main.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main.py b/main.py index aceb99b..35a26fb 100644 --- a/main.py +++ b/main.py @@ -62,6 +62,15 @@ def warning_log(warning): log = date datei.close() +# Materechner Logic +'''' +def mate_logik(sorte, anzahl): + anzahl = anzahl + 1 + koffeingehalt = 0 + match sorte: + case "Mio Mio": + koffeingehalt = ''' + # Qr-code generator# def create_qr(id): if not os.path.exists("./static/img/qr.png"): From 8953e830e6d812cd3736a96dafe07522bdd1e0d1 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 3 Dec 2022 10:50:27 +0100 Subject: [PATCH 003/126] stopuhr --- main.py | 13 ++++-- static/js/game.js | 90 ++++++++++++++++++------------------------ templates/session.html | 12 ++++-- 3 files changed, 55 insertions(+), 60 deletions(-) diff --git a/main.py b/main.py index 35a26fb..703f25f 100644 --- a/main.py +++ b/main.py @@ -71,6 +71,10 @@ def mate_logik(sorte, anzahl): case "Mio Mio": koffeingehalt = ''' +# mws = mate wirtschafts system +def mws(): + return mate + # Qr-code generator# def create_qr(id): if not os.path.exists("./static/img/qr.png"): @@ -291,18 +295,19 @@ def login(): def stopuhr(): if session: log_server("called /stopuhr") - spielName = request.form['spielname'] + spielName = request.form['spiel'] + art = request.form['art'] zeit = request.form['zeit'] userId = request.form['userid'] - sessionId = request.form['sessionid'] - l = f"INSERT INTO game VALUES( \'{sessionID}\', \'{userId}\',\'{spielName}\', \'{zeit}\');" + sessionId = request.form['sessionID'] + l = f"INSERT INTO game VALUES( \'{sessionId}\', \'{userId}\',\'{spielName}\',\'{art}\', \'{zeit}\');" try: warning_log("verbindung mit Datenbank wurde aufgenommen") dbcon(l) log_server("time entered successfully /stopuhr") except: error_log("unable to run sql /stopuhr") - return render_template() + return redirect(f'/session/{sessionId}') else: warning_log(" called /stopuhr without being logged in") return render_template('passwd.html') diff --git a/static/js/game.js b/static/js/game.js index 85ba215..9b913df 100644 --- a/static/js/game.js +++ b/static/js/game.js @@ -1,54 +1,40 @@ -var modal = document.getElementById('id01'); - // When the user clicks anywhere outside of the modal, close it - window.onclick = (event) => - event.target == modal ? - modal.style.display = "none" : undefined; +var h1 = document.getElementsByTagName('h1')[0]; +var start = document.getElementById('strt'); +var stop = document.getElementById('stp'); +var reset = document.getElementById('rst'); +var sec = 0; +var min = 0; +var hrs = 0; +var t; - window.onload = function () { - var seconds = 00; - var tens = 00; - var appendTens = document.getElementById("tens") - var appendSeconds = document.getElementById("seconds") - var buttonStart = document.getElementById('button-start'); - var buttonStop = document.getElementById('button-stop'); - var buttonReset = document.getElementById('button-reset'); - var Interval ; - var time = seconds + tens; - - function onclckfn() { - clearInterval(Interval); - Interval = setInterval(startTimer, 10); - } - - buttonStop.onclick = () => - clearInterval(Interval); - - buttonReset.onclick = function() { - clearInterval(Interval); - tens = "00"; - seconds = "00"; - appendTens.innerHTML = tens; - appendSeconds.innerHTML = seconds; - } - - function startTimer () { - tens++; - - if(tens <= 9) - appendTens.innerHTML = "0" + tens; - - if (tens > 9) - appendTens.innerHTML = tens; - - if (tens > 99) { - console.log("seconds"); - seconds++; - appendSeconds.innerHTML = "0" + seconds; - tens = 0; - appendTens.innerHTML = "0" + 0; - } - - if (seconds > 9) - appendSeconds.innerHTML = seconds; - } +function tick(){ + sec++; + if (sec >= 60) { + sec = 0; + min++; + if (min >= 60) { + min = 0; + hrs++; + } + } +} +function add() { + tick(); + h1.textContent = (hrs > 9 ? hrs : "0" + hrs) + + ":" + (min > 9 ? min : "0" + min) + + ":" + (sec > 9 ? sec : "0" + sec); + timer(); +} +function timer() { + t = setTimeout(add, 1000); +} + +timer(); +start.onclick = timer; +stop.onclick = function() { + clearTimeout(t); +} +reset.onclick = function() { + h1.textContent = "00:00:00"; + seconds = 0; minutes = 0; hours = 0; } diff --git a/templates/session.html b/templates/session.html index f99e5ed..b1c2fbd 100644 --- a/templates/session.html +++ b/templates/session.html @@ -62,15 +62,19 @@
-

00:00

- - - +

+ + + +

+ + + From d6635c7049ed1a18ad3f2f34370a503554fd6beb Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 3 Dec 2022 10:54:31 +0100 Subject: [PATCH 004/126] mate fix --- templates/session.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/session.html b/templates/session.html index b1c2fbd..2b105db 100644 --- a/templates/session.html +++ b/templates/session.html @@ -106,7 +106,7 @@
- {% for post in game %} +

{{ game }}

-
- {% endfor %} +
From 391174b09a56fef9d6a25e82699184da919c5dea Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 3 Dec 2022 12:11:29 +0100 Subject: [PATCH 013/126] style --- static/css/style.css | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/static/css/style.css b/static/css/style.css index 96d27c3..5ea984a 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -161,4 +161,20 @@ a { .dark-mode { background-image: linear-gradient(to right, rgb(5, 49, 16), rgb(63, 63, 236)) - } \ No newline at end of file + } + + summary::-webkit-details-marker, + summary::marker { + content: ""; /* Verwendung des "Pfeil"-Symbols anstelle des Dreiecks */ + color: rgb(0, 0, 0); + font-size: 2em; + font-weight: bold; + transition: all 0.5s; + } + + + details[open] summary::-webkit-details-marker, + details[open] summary::marker { + content: " "; + + } \ No newline at end of file From 9c7057512836dd4130b6f27652b72b3e0d9026b6 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Tue, 6 Dec 2022 18:20:29 +0100 Subject: [PATCH 014/126] event status --- main.py | 3 ++- party.sql | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 0459d84..4a00863 100644 --- a/main.py +++ b/main.py @@ -172,7 +172,8 @@ def get_planer(): sessionID = request.form['sessionID'] zeit = request.form['zeit'] pfad = "/session/" + sessionID - l = f"INSERT INTO planer VALUES( \'{event}\', \'{zeit}\', \'{sessionID}\');" + status = "running" + l = f"INSERT INTO planer VALUES( \'{event}\', \'{zeit}\', \'{sessionID}\',\'{status}\');" log_server("neues Event") try: con = sqlite3.connect("party.db") diff --git a/party.sql b/party.sql index 1775527..83c01a1 100644 --- a/party.sql +++ b/party.sql @@ -4,5 +4,5 @@ CREATE TABLE seession (sessionID INTEGER PRIMARY KEY, sessionname TEXT, sessions CREATE TABLE chat (sessionID INTEGER, userID INTEGER, chatmessage TEXT, ZEIT TEXT); CREATE TABLE game (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielaktivität TEXT, ZEIT TEXT); CREATE TABLE uploadgame (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielstand TEXT); -CREATE TABLE planer (eventname TEXT, eventzeit TEXT, sessionID INTEGER); +CREATE TABLE planer (eventname TEXT, eventzeit TEXT, sessionID INTEGER, eventstatus TEXT); CREATE TABLE mate (matename TEXT, mateanzahl INTEGER, sessionID INTEGER); \ No newline at end of file From b0af391a595c90a06e28840f8431de0e68c1540a Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Thu, 8 Dec 2022 13:41:08 +0100 Subject: [PATCH 015/126] login --- main.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/main.py b/main.py index 4a00863..35d626b 100644 --- a/main.py +++ b/main.py @@ -398,15 +398,10 @@ def get_login(): userid = request.form['userID'] l = f"select * from user where userID = \'{userid}\' and username=\'{username}\' and sessionID=\'{sessionId}\';" account = dbcon(l) - if account: - session['loggedin'] = True - user_count = +1 # session['username'] = account['username'] - log_server("loggedin successfully") - return redirect(f'/session/{sessionId}') - else: - return "{ \"message\": \"Login failed\"'}" - warning_log("unable to create new user /get_login") + log_server("loggedin successfully") + return redirect(f'/session/{sessionId}') + con.close() @app.route("/new", methods=['POST']) @@ -424,15 +419,11 @@ def new(): con.commit() con.close() account = True - if account: - session['loggedin'] = True - user_count = +1 + # session['username'] = account['username'] - log_server("created new user successfully") - return redirect(f'/session/{sessionId}') - else: - return "{ \"message\": \"Login failed\"'}" - warning_log("unable to create new user /new") + log_server("created new user successfully") + return redirect(f'/session/{sessionId}') + con.close() @app.errorhandler(404) From a2dd65904c3c8b8e063fead982182d84f6c81c21 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Thu, 8 Dec 2022 13:49:17 +0100 Subject: [PATCH 016/126] mate --- main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.py b/main.py index 35d626b..f5146b7 100644 --- a/main.py +++ b/main.py @@ -89,6 +89,8 @@ def mate_logik(sorte, anzahl): if sorte == "Bionade Mate": koffeingehalt = 20 + + return koffeingehalt * anzahl ''' anzahl = anzahl + 1 koffeingehalt = 0 @@ -98,6 +100,7 @@ def mate_logik(sorte, anzahl): # mws = mate wirtschafts system def mws(): + return mate # Qr-code generator# From 0de0a742a55774e4f2f250f94f66a4e3c8691339 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 9 Dec 2022 07:36:30 +0100 Subject: [PATCH 017/126] login --- main.py | 7 ++++++- templates/login.html | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index f5146b7..a18b23c 100644 --- a/main.py +++ b/main.py @@ -400,7 +400,12 @@ def get_login(): sessionId = request.form['sessionID'] userid = request.form['userID'] l = f"select * from user where userID = \'{userid}\' and username=\'{username}\' and sessionID=\'{sessionId}\';" - account = dbcon(l) + con = sqlite3.connect("party.db") + warning_log("verbindung mit db wurde aufgenommen") + cur = con.cursor() + cur.execute(l) + con.commit() + con.close() # session['username'] = account['username'] log_server("loggedin successfully") return redirect(f'/session/{sessionId}') diff --git a/templates/login.html b/templates/login.html index d6dc9ae..4d46f60 100644 --- a/templates/login.html +++ b/templates/login.html @@ -42,7 +42,7 @@
- +
From 34831f5db499d4b3c554e8042d06daff011bc411 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 9 Dec 2022 07:59:06 +0100 Subject: [PATCH 018/126] style --- main.py | 13 ++++++++++--- static/css/style.css | 7 ++++++- templates/session.html | 15 +++++++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index a18b23c..d9fc76c 100644 --- a/main.py +++ b/main.py @@ -200,8 +200,15 @@ def session(id): log_server(f"called /session/{id}") con = sqlite3.connect("party.db") cur = con.cursor() - l = f"SELECT eventname, eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" - asd = cur.execute(l).fetchall() + l = f"SELECT eventname FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" + eventname = cur.execute(l).fetchall() + con.commit() + cur.close() + + con = sqlite3.connect("party.db") + cur = con.cursor() + l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" + eventzeit = cur.execute(l).fetchall() con.commit() cur.close() @@ -226,7 +233,7 @@ def session(id): con.commit() cur.close() - return render_template("session.html", asd=asd, game=game, das=user_count, er=creator, mate=mate, der=uptime()) + return render_template("session.html", eventname=eventname, eventzeit=eventzeit, game=game, das=user_count, er=creator, mate=mate, der=uptime()) else: warning_log(" called /session without being logged in") return render_template('passwd.html') diff --git a/static/css/style.css b/static/css/style.css index 5ea984a..4c6bb9c 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -177,4 +177,9 @@ a { details[open] summary::marker { content: " "; - } \ No newline at end of file + }table, th, td, caption { + border: thick solid #33363d; + border-collapse: collapse; + } + + \ No newline at end of file diff --git a/templates/session.html b/templates/session.html index 72042a7..dc3d067 100644 --- a/templates/session.html +++ b/templates/session.html @@ -46,8 +46,19 @@ From 8a8e2453b35c81d8eecf27b4ab5b918d068bf806 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 9 Dec 2022 08:11:27 +0100 Subject: [PATCH 021/126] creator sql Abfrage --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 4b3fa07..fc6dadb 100644 --- a/main.py +++ b/main.py @@ -215,7 +215,7 @@ def session(id): con = sqlite3.connect("party.db") warning_log("Verbindung mit Datenbank wurde aufgenommen /seession") cur = con.cursor() - creator = cur.execute("SELECT username FROM user WHERE info = 'creator'").fetchall() + creator = cur.execute("SELECT username FROM user WHERE info = 'Host'").fetchall() cur.close() con = sqlite3.connect("party.db") @@ -254,7 +254,7 @@ def session(id): con.commit() cur.close() - return render_template("session.html", zeit=zeit, aktivitaet=aktivitaet, user=user, eventname=eventname, eventzeit=eventzeit, game=game, das=user_count, er=creator, mate=mate, der=uptime()) + return render_template("session.html", zeit=zeit, aktivitaet=aktivitaet, user=user, eventname=eventname, eventzeit=eventzeit, game=game, das=user_count, creator=creator, mate=mate, der=uptime()) else: warning_log(" called /session without being logged in") return render_template('passwd.html') From 4f1c11df5cbdc8d0d4a42bbc2c908e68e51a4514 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 10 Dec 2022 15:08:02 +0100 Subject: [PATCH 022/126] re split versuch --- main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.py b/main.py index fc6dadb..2c05ddd 100644 --- a/main.py +++ b/main.py @@ -5,6 +5,7 @@ import os import time import qrcode import shutil +import re starttime = 0 user_count = 0 @@ -209,6 +210,7 @@ def session(id): cur = con.cursor() l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" eventzeit = cur.execute(l).fetchall() + #eventtime = re.split(",", eventzeit) con.commit() cur.close() From eb94792c4e18ac00322ae93b649ad0b3a036128b Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 10 Dec 2022 15:23:04 +0100 Subject: [PATCH 023/126] stopuhr fix --- main.py | 3 ++- static/js/game.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 2c05ddd..dcea394 100644 --- a/main.py +++ b/main.py @@ -210,7 +210,8 @@ def session(id): cur = con.cursor() l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" eventzeit = cur.execute(l).fetchall() - #eventtime = re.split(",", eventzeit) + print (eventzeit) + #eventtime = re.split(',', eventzeit) con.commit() cur.close() diff --git a/static/js/game.js b/static/js/game.js index 9b913df..af729ed 100644 --- a/static/js/game.js +++ b/static/js/game.js @@ -37,4 +37,5 @@ stop.onclick = function() { reset.onclick = function() { h1.textContent = "00:00:00"; seconds = 0; minutes = 0; hours = 0; + sec = 0; min = 0; hrs = 0; } From 75252a8802b25295f0527545ac0dc7d1b89504df Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 10 Dec 2022 15:32:06 +0100 Subject: [PATCH 024/126] style css --- static/css/style.css | 12 ++++++++---- templates/login.html | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 4c6bb9c..03dc34d 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -10,7 +10,7 @@ a { /* Set a style for all buttons */ button { background-color: #6d4087; - color: white; + color: rgb(29, 24, 24); padding: 14px 20px; margin: 8px 0; border: none; @@ -90,10 +90,11 @@ a { margin: 8px 0; padding: 12px 20px; display: inline-block; - border: 2px solid green; + border: 2px solid rgb(58, 58, 58); box-sizing: border-box; border-radius: 12px; - color: #839c87; + color: #050705; + background-color: rgb(142, 142, 143); } @@ -177,9 +178,12 @@ a { details[open] summary::marker { content: " "; - }table, th, td, caption { + } + table, th, td, caption { border: thick solid #33363d; border-collapse: collapse; } + + \ No newline at end of file diff --git a/templates/login.html b/templates/login.html index 4d46f60..f04f55f 100644 --- a/templates/login.html +++ b/templates/login.html @@ -39,7 +39,7 @@
- +
@@ -60,7 +60,7 @@
- +
From 7aa39680d32cdebbd2bb33116e6c9837ac96e49b Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 16 Dec 2022 19:50:47 +0100 Subject: [PATCH 025/126] mws --- main.py | 14 +++++++++++++- party.sql | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index dcea394..ec65e0a 100644 --- a/main.py +++ b/main.py @@ -15,6 +15,7 @@ date = time.strftime("%d-%m-%Y %H:%M:%S", time.localtime(time.time())) zeit = time.strftime("%H%M", time.localtime(time.time())) log = date app.config['SECRET_KEY'] = 'party' +matekiste = 0 def dbcon(sql): con = sqlite3.connect("party.db") @@ -100,7 +101,7 @@ def mate_logik(sorte, anzahl): koffeingehalt = ''' # mws = mate wirtschafts system -def mws(): +def mws(kisten): return mate @@ -270,6 +271,17 @@ def mate(): mateFlaschen = request.form['mateFlaschen'] sessionId = request.form['sessionID'] mateSorte = request.form['mateSorte'] + + if mateSorte == "Club Mate" & mateFlaschen == 20: + matekiste +1 + mws(matekiste) + if mateSorte == "Mio Mio" & mateFlaschen == 12: + matekiste + 1 + mws(matekiste) + if mateSorte == "Flora Mate" & mateFlaschen == 20: + matekiste +1 + mws(matekiste) + mateSql = f"INSERT INTO mate VALUES (\"{mateSorte}\", \'{mateFlaschen}\', \'{sessionId}\');" try: con = sqlite3.connect("party.db") diff --git a/party.sql b/party.sql index 83c01a1..7d71c1d 100644 --- a/party.sql +++ b/party.sql @@ -5,4 +5,5 @@ CREATE TABLE chat (sessionID INTEGER, userID INTEGER, chatmessage TEXT, ZEIT TEX CREATE TABLE game (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielaktivität TEXT, ZEIT TEXT); CREATE TABLE uploadgame (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielstand TEXT); CREATE TABLE planer (eventname TEXT, eventzeit TEXT, sessionID INTEGER, eventstatus TEXT); -CREATE TABLE mate (matename TEXT, mateanzahl INTEGER, sessionID INTEGER); \ No newline at end of file +CREATE TABLE mate (matename TEXT, mateanzahl INTEGER, sessionID INTEGER); +CREATE TABLE mws (matekisten INTEGER, sessionID INTEGER NOT NULL) \ No newline at end of file From 0fc723361efb78d14027b763daefcb3c52d14c7f Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 16 Dec 2022 19:53:59 +0100 Subject: [PATCH 026/126] mvs die 2. --- main.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/main.py b/main.py index ec65e0a..f6bd632 100644 --- a/main.py +++ b/main.py @@ -281,6 +281,21 @@ def mate(): if mateSorte == "Flora Mate" & mateFlaschen == 20: matekiste +1 mws(matekiste) + if mateSorte == "Mate Mate" & mateFlaschen == 20: + martekiste + 1 + mws(martekiste) + if mateSorte == "Buenos Mate" & mateFlaschen == 20: + matekiste +1 + mws(matekiste) + if mateSorte == "Charitea Mate" & mateFlaschen == 12: + matekiste + 1 + mws(matekiste) + if mateSorte == "1337 Mate" & mateFlaschen == 20: + matekiste +1 + mws(matekiste) + if mateSorte == "Bionade Mate" & mateFlaschen == 20: + martekiste + 1 + mws(martekiste) mateSql = f"INSERT INTO mate VALUES (\"{mateSorte}\", \'{mateFlaschen}\', \'{sessionId}\');" try: From 078de3d68016e2bf65a5b57684e086d8e402cb56 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 16 Dec 2022 20:01:12 +0100 Subject: [PATCH 027/126] mws logs --- main.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/main.py b/main.py index f6bd632..4f6f09d 100644 --- a/main.py +++ b/main.py @@ -103,6 +103,7 @@ def mate_logik(sorte, anzahl): # mws = mate wirtschafts system def mws(kisten): + log_server("mws wurde angefragt") return mate # Qr-code generator# @@ -275,18 +276,23 @@ def mate(): if mateSorte == "Club Mate" & mateFlaschen == 20: matekiste +1 mws(matekiste) + log_server("mws wurde angefragt") if mateSorte == "Mio Mio" & mateFlaschen == 12: matekiste + 1 mws(matekiste) + log_server("mws wurde angefragt") if mateSorte == "Flora Mate" & mateFlaschen == 20: matekiste +1 mws(matekiste) + log_server("mws wurde angefragt") if mateSorte == "Mate Mate" & mateFlaschen == 20: martekiste + 1 mws(martekiste) + log_server("mws wurde angefragt") if mateSorte == "Buenos Mate" & mateFlaschen == 20: matekiste +1 mws(matekiste) + log_server("mws wurde angefragt") if mateSorte == "Charitea Mate" & mateFlaschen == 12: matekiste + 1 mws(matekiste) From c1730bdd1e395d89b51e3cd75fa201cf998d4ec9 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 16 Dec 2022 20:08:16 +0100 Subject: [PATCH 028/126] mws update --- main.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/main.py b/main.py index 4f6f09d..d8d7ba5 100644 --- a/main.py +++ b/main.py @@ -273,33 +273,28 @@ def mate(): sessionId = request.form['sessionID'] mateSorte = request.form['mateSorte'] - if mateSorte == "Club Mate" & mateFlaschen == 20: + if mateSorte == "Club Mate" and mateFlaschen == 20: matekiste +1 mws(matekiste) - log_server("mws wurde angefragt") - if mateSorte == "Mio Mio" & mateFlaschen == 12: + if mateSorte == "Mio Mio" and mateFlaschen == 12: matekiste + 1 mws(matekiste) - log_server("mws wurde angefragt") - if mateSorte == "Flora Mate" & mateFlaschen == 20: + if mateSorte == "Flora Mate" and mateFlaschen == 20: matekiste +1 mws(matekiste) - log_server("mws wurde angefragt") - if mateSorte == "Mate Mate" & mateFlaschen == 20: + if mateSorte == "Mate Mate" and mateFlaschen == 20: martekiste + 1 mws(martekiste) - log_server("mws wurde angefragt") - if mateSorte == "Buenos Mate" & mateFlaschen == 20: + if mateSorte == "Buenos Mate" and mateFlaschen == 20: matekiste +1 mws(matekiste) - log_server("mws wurde angefragt") - if mateSorte == "Charitea Mate" & mateFlaschen == 12: + if mateSorte == "Charitea Mate" and mateFlaschen == 12: matekiste + 1 mws(matekiste) - if mateSorte == "1337 Mate" & mateFlaschen == 20: + if mateSorte == "1337 Mate" and mateFlaschen == 20: matekiste +1 mws(matekiste) - if mateSorte == "Bionade Mate" & mateFlaschen == 20: + if mateSorte == "Bionade Mate" and mateFlaschen == 20: martekiste + 1 mws(martekiste) From 8eeec3c6d1aa464eab22d0d9810d27c7c97db743 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 17 Dec 2022 09:30:44 +0100 Subject: [PATCH 029/126] sessionStorage --- static/js/control.js | 6 ++++++ templates/createSession.html | 4 ++-- templates/login.html | 27 ++++++++++++++------------- templates/logout.html | 7 +++++++ 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/static/js/control.js b/static/js/control.js index 49881a2..ab51f3f 100644 --- a/static/js/control.js +++ b/static/js/control.js @@ -1,3 +1,9 @@ function save() { +} + +function export_session() { + + + } diff --git a/templates/createSession.html b/templates/createSession.html index 95adbc6..79ce8cd 100644 --- a/templates/createSession.html +++ b/templates/createSession.html @@ -22,9 +22,9 @@ diff --git a/templates/login.html b/templates/login.html index f04f55f..8805a93 100644 --- a/templates/login.html +++ b/templates/login.html @@ -39,12 +39,12 @@
- +

- + @@ -60,12 +60,12 @@
- +

- + @@ -74,17 +74,18 @@ - -
- \ No newline at end of file diff --git a/templates/logout.html b/templates/logout.html index 85812d1..6287a83 100644 --- a/templates/logout.html +++ b/templates/logout.html @@ -12,6 +12,13 @@ + + + + \ No newline at end of file From edb476c49ca1c44a054a539b443da0344b487b27 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 17 Dec 2022 09:31:57 +0100 Subject: [PATCH 030/126] frage nach verlassen --- templates/logout.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/logout.html b/templates/logout.html index 6287a83..ecc480e 100644 --- a/templates/logout.html +++ b/templates/logout.html @@ -9,11 +9,12 @@

Adios

+

Wollen Sie die Session verlassen?

 - +
\ No newline at end of file From b2ec51b8a93af155e6a481e54eefad339c55566d Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 17 Dec 2022 09:43:11 +0100 Subject: [PATCH 033/126] sessionID fix --- templates/login.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/login.html b/templates/login.html index e0c8dbb..33949b7 100644 --- a/templates/login.html +++ b/templates/login.html @@ -44,7 +44,7 @@
- + @@ -65,7 +65,7 @@
- + @@ -91,7 +91,7 @@ } function setID2() { - let sessID = document.getElementById("id1").value + let sessID = document.getElementById("id2").value window.sessionStorage.setItem("sessionID", sessID) } From 2639bdcbd31c47cb969d16f69b9682bfe81da4c5 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 17 Dec 2022 10:06:11 +0100 Subject: [PATCH 034/126] qr_code --- templates/session.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/session.html b/templates/session.html index 6cd4378..ff8f6e4 100644 --- a/templates/session.html +++ b/templates/session.html @@ -157,10 +157,16 @@

Uptime: {{der}}

Creator: {{er}}

-

QR-Code

+ {% endblock %} +
+ +

QR-Code

+ + +
From 62ece402cf5de2cf2710f9152f2e81800d547f01 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Wed, 21 Dec 2022 16:36:27 +0100 Subject: [PATCH 042/126] f --- templates/session.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/session.html b/templates/session.html index f7a7c73..7e698cd 100644 --- a/templates/session.html +++ b/templates/session.html @@ -100,8 +100,7 @@
-
- +
From 547dfa0638af40b4f654c6f192fdb3a04cfa5c2f Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Wed, 21 Dec 2022 16:57:04 +0100 Subject: [PATCH 043/126] some changes --- main.py | 5 +++++ static/css/style.css | 2 +- static/js/general.js | 2 ++ templates/changeSession.html | 27 +++++++++++++++++++++++++++ templates/createSession.html | 9 +++++++-- templates/login.html | 2 +- 6 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 templates/changeSession.html diff --git a/main.py b/main.py index 4f6e098..9fdf616 100644 --- a/main.py +++ b/main.py @@ -342,6 +342,11 @@ def passwd(): log_server("called /passwd") return render_template("passwd.html") +@app.route("/change") +def change(): + log_server("called /change") + return render_template("changeSession.html") + @app.route("/create_session") def create_session(): log_server("called /create_session") diff --git a/static/css/style.css b/static/css/style.css index 03dc34d..7cffeae 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -85,7 +85,7 @@ a { } - input[type=text], input[type=password] input[type=time] input[type=date]{ + input[type=text], input[type=password] input[type=time]{ width: 30%; margin: 8px 0; padding: 12px 20px; diff --git a/static/js/general.js b/static/js/general.js index 9986717..33390a6 100644 --- a/static/js/general.js +++ b/static/js/general.js @@ -18,3 +18,5 @@ let name = sessionStorage.getItem("name"); document.getElementById("user").innerHTML = name; + + diff --git a/templates/changeSession.html b/templates/changeSession.html new file mode 100644 index 0000000..537e8b3 --- /dev/null +++ b/templates/changeSession.html @@ -0,0 +1,27 @@ + + + + + + + + Change Session + + +
+

Du bist bereits in Session:

+

+

Möchtest du diese Verlassen, und in eine andere Session?

+ + + + + + + +
+ + \ No newline at end of file diff --git a/templates/createSession.html b/templates/createSession.html index 64a506a..e976777 100644 --- a/templates/createSession.html +++ b/templates/createSession.html @@ -11,10 +11,10 @@
- + - + @@ -31,6 +31,11 @@ window.sessionStorage.setItem("userID", "1") window.sessionStorage.setItem("name", "Host") } + + function setSname() { + let sessionname = document.getElementById("sessionName").value + window.sessionStorage.setItem("session", sessionname) + } diff --git a/templates/login.html b/templates/login.html index dcbe388..4098a88 100644 --- a/templates/login.html +++ b/templates/login.html @@ -65,7 +65,7 @@
- +
From fedd0732dd952bd6d44082cb811fc53effb34bf7 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Wed, 21 Dec 2022 17:02:42 +0100 Subject: [PATCH 044/126] logout --- templates/logout.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/logout.html b/templates/logout.html index b97fc5a..5d6f16c 100644 --- a/templates/logout.html +++ b/templates/logout.html @@ -9,6 +9,12 @@

Adios 👋

+

+ +

Wollen Sie die Session verlassen?

From e929d0a8936645543f7fbc0577755d7f632ed635 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Thu, 22 Dec 2022 07:09:30 +0100 Subject: [PATCH 045/126] mate trinken --- main.py | 16 ++++++++++++++- templates/changeSession.html | 4 +++- templates/session.html | 38 ++++++++++++++++++++++++++++++++++-- 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index 9fdf616..c5ff136 100644 --- a/main.py +++ b/main.py @@ -259,6 +259,20 @@ def session(id): con.commit() cur.close() + con = sqlite3.connect("party.db") + cur = con.cursor() + l = f"SELECT username FROM user WHERE sessionID = \'{id}\';" + unames = cur.execute(l).fetchall() + con.commit() + cur.close() + + con = sqlite3.connect("party.db") + cur = con.cursor() + l = f"SELECT userID FROM user WHERE sessionID = \'{id}\';" + uids = cur.execute(l).fetchall() + con.commit() + cur.close() + con = sqlite3.connect("party.db") cur = con.cursor() l = f"SELECT ZEIT FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" @@ -266,7 +280,7 @@ def session(id): con.commit() cur.close() - return render_template("session.html", zeit=zeit, aktivitaet=aktivitaet, user=user, eventname=eventname, eventzeit=eventzeit, game=game, useranzahl=useranzahl, creator=creator, mate=mate, der=uptime()) + return render_template("session.html", uids=uids, unames=unames, zeit=zeit, aktivitaet=aktivitaet, user=user, eventname=eventname, eventzeit=eventzeit, game=game, useranzahl=useranzahl, creator=creator, mate=mate, der=uptime()) else: warning_log(" called /session without being logged in") return render_template('passwd.html') diff --git a/templates/changeSession.html b/templates/changeSession.html index 537e8b3..49f14ac 100644 --- a/templates/changeSession.html +++ b/templates/changeSession.html @@ -13,7 +13,9 @@

Möchtest du diese Verlassen, und in eine andere Session?

- + + + diff --git a/templates/session.html b/templates/session.html index 7e698cd..651b5f8 100644 --- a/templates/session.html +++ b/templates/session.html @@ -142,7 +142,7 @@ +
+

Mate trinken

 +
+ +
+ +
+ +
+ + +
+ + +
+
+

User Verwaltung

-

An dieser Stelle sollen später die User angezeigt werden, und der Session Admin kann diese dann verwalten

+ + + + + + + + + + + + +
UserIDUserStatus
{{ uids }}{{ unames }}Online
From a9199934a96179552d6558ec2a4d645f348be7a8 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 23 Dec 2022 07:59:22 +0100 Subject: [PATCH 046/126] fix --- main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.py b/main.py index c50e9da..f741cd6 100644 --- a/main.py +++ b/main.py @@ -304,6 +304,8 @@ def session(id): useranzahl=useranzahl, creator=creator, mate=mate, + uids=uids, + unames=unames, der=uptime()) else: From fcc25d44173b8a69a2e3f475affbf660d1c31b83 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 23 Dec 2022 08:20:50 +0100 Subject: [PATCH 047/126] mate --- main.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/main.py b/main.py index f741cd6..ff73fda 100644 --- a/main.py +++ b/main.py @@ -365,6 +365,33 @@ def mate(): warning_log(" called /mate without being logged in") return render_template('/passwd') +@app.route("/drink", methods=['POST']) +def drink(): + log_server("called /drink") + + if session: + mateFlaschen = request.form['mateFlaschen'] + sessionId = request.form['sessionID'] + mateSorte = request.form['mateSorte'] + + mateSql = f"INSERT INTO mate VALUES (\"{mateSorte}\", \'{mateFlaschen}\', \'{sessionId}\');" + try: + con = sqlite3.connect("party.db") + warning_log("Verbindung mit Datenbank wurde aufgenommen /drink") + cur = con.cursor() + cur.execute(mateSql) + con.commit() + con.close() + + mate_logik(mateSorte, mateFlaschen) + log_server("mate wurde in Datenbank eingefügt") + except sqlite3.Error as e: + error_log(f"error while executing sql: {e}") + return redirect(f'/session/{sessionId}') + else: + warning_log(" called /mate without being logged in") + return render_template('/passwd') + @app.route("/logout") def logout(): From 81a1bb47f8cea6406432740ace9366f2f136916c Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 23 Dec 2022 08:24:25 +0100 Subject: [PATCH 048/126] =?UTF-8?q?aufr=C3=A4umen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 38 ++++---------------------------------- templates/session.html | 2 +- 2 files changed, 5 insertions(+), 35 deletions(-) diff --git a/main.py b/main.py index ff73fda..622f6c7 100644 --- a/main.py +++ b/main.py @@ -219,75 +219,45 @@ def session(id): l = f"SELECT eventname FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" eventname = cur.execute(l).fetchall() con.commit() - cur.close() + - con = sqlite3.connect("party.db") - cur = con.cursor() + l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" eventzeit = cur.execute(l).fetchall() print (eventzeit) #eventtime = re.split(',', eventzeit) con.commit() - cur.close() - - con = sqlite3.connect("party.db") - warning_log("Verbindung mit Datenbank wurde aufgenommen /seession") - cur = con.cursor() + creator = cur.execute("SELECT username FROM user WHERE info = 'Host'").fetchall() - cur.close() + con.commit() - con = sqlite3.connect("party.db") - warning_log("Verbindung mit Datenbank wurde aufgenommen /seession") - cur = con.cursor() l = f"SELECT count(username) FROM user WHERE sessionID = \'{id}\';" useranzahl = cur.execute(l).fetchall() - cur.close() - con = sqlite3.connect("party.db") - warning_log("Verbindung mit Datenbank wurde aufgenommen /seession") - cur = con.cursor() l = f"SELECT matename, mateanzahl FROM mate WHERE sessionID = \'{id}\' ORDER BY mateanzahl;" mate = cur.execute(l).fetchall() con.commit() - cur.close() - con = sqlite3.connect("party.db") - cur = con.cursor() l = f"SELECT Spielname FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" game = cur.execute(l).fetchall() con.commit() - cur.close() - con = sqlite3.connect("party.db") - cur = con.cursor() l = f"SELECT userID FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" user = cur.execute(l).fetchall() con.commit() - cur.close() - con = sqlite3.connect("party.db") - cur = con.cursor() l = f"SELECT Spielaktivität FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" aktivitaet = cur.execute(l).fetchall() con.commit() - cur.close() - con = sqlite3.connect("party.db") - cur = con.cursor() l = f"SELECT username FROM user WHERE sessionID = \'{id}\';" unames = cur.execute(l).fetchall() con.commit() - cur.close() - con = sqlite3.connect("party.db") - cur = con.cursor() l = f"SELECT userID FROM user WHERE sessionID = \'{id}\';" uids = cur.execute(l).fetchall() con.commit() - cur.close() - con = sqlite3.connect("party.db") - cur = con.cursor() l = f"SELECT ZEIT FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" zeit = cur.execute(l).fetchall() con.commit() diff --git a/templates/session.html b/templates/session.html index a070891..73c37b5 100644 --- a/templates/session.html +++ b/templates/session.html @@ -167,7 +167,7 @@

Mate trinken

 -
+
From a143f33fcf563e76a46888bdd76d60d1c1945d8c Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 23 Dec 2022 08:28:02 +0100 Subject: [PATCH 049/126] clean up --- main.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/main.py b/main.py index 622f6c7..2c27982 100644 --- a/main.py +++ b/main.py @@ -8,12 +8,9 @@ import shutil import re starttime = 0 -user_count = 0 -userid = 0 app = Flask(__name__, template_folder='templates/') date = time.strftime("%d-%m-%Y %H:%M:%S", time.localtime(time.time())) zeit = time.strftime("%H%M", time.localtime(time.time())) -log = date app.config['SECRET_KEY'] = 'party' matekiste = 0 From 62abb07b48f843765c59f1bb5082400bc47891cb Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 17:26:18 +0100 Subject: [PATCH 050/126] removed brackets --- main.py | 8 +- templates/session.html | 456 +++++++++++++++++++++-------------------- 2 files changed, 235 insertions(+), 229 deletions(-) diff --git a/main.py b/main.py index 2c27982..7a52ec2 100644 --- a/main.py +++ b/main.py @@ -216,9 +216,7 @@ def session(id): l = f"SELECT eventname FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" eventname = cur.execute(l).fetchall() con.commit() - - l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" eventzeit = cur.execute(l).fetchall() print (eventzeit) @@ -265,8 +263,8 @@ def session(id): zeit=zeit, aktivitaet=aktivitaet, user=user, - eventname=eventname, - eventzeit=eventzeit, + eventname=eventname[0], + eventzeit=eventzeit[0], game=game, useranzahl=useranzahl, creator=creator, @@ -456,7 +454,7 @@ def stopuhr(): warning_log("verbindung mit Datenbank wurde aufgenommen") dbcon(l) log_server("time entered successfully /stopuhr") - except e: + except Exception: error_log("unable to run sql /stopuhr") return redirect(f'/session/{sessionId}') else: diff --git a/templates/session.html b/templates/session.html index 73c37b5..e12b95d 100644 --- a/templates/session.html +++ b/templates/session.html @@ -1,244 +1,252 @@ - + + 🎉 Party - - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + +
- - - - - - + + + + + + + \ No newline at end of file From 420e4e9c3e4b18138c4e6be555def212996fa9d2 Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 17:28:06 +0100 Subject: [PATCH 051/126] check for len --- main.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/main.py b/main.py index 7a52ec2..a966f56 100644 --- a/main.py +++ b/main.py @@ -258,20 +258,20 @@ def session(id): con.commit() cur.close() - - return render_template("session.html", - zeit=zeit, - aktivitaet=aktivitaet, - user=user, - eventname=eventname[0], - eventzeit=eventzeit[0], - game=game, - useranzahl=useranzahl, - creator=creator, - mate=mate, - uids=uids, - unames=unames, - der=uptime()) + if len(eventzeit) > 0 and len(eventname) > 0: + return render_template("session.html", + zeit=zeit, + aktivitaet=aktivitaet, + user=user, + eventname=eventname[0], + eventzeit=eventzeit[0], + game=game, + useranzahl=useranzahl, + creator=creator, + mate=mate, + uids=uids, + unames=unames, + der=uptime()) else: warning_log(" called /session without being logged in") From e46665472a4377a06b9b4cc850f0d8e29250449f Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 17:30:32 +0100 Subject: [PATCH 052/126] renamed fun --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index a966f56..4988823 100644 --- a/main.py +++ b/main.py @@ -208,7 +208,7 @@ def get_planer(): @app.route("/session/") -def session(id): +def _session(id): if session: log_server(f"called /session/{id}") con = sqlite3.connect("party.db") From e7f8d117d0109fe22cfac59a9215968e5273a706 Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 17:33:04 +0100 Subject: [PATCH 053/126] test --- main.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/main.py b/main.py index 4988823..0307da3 100644 --- a/main.py +++ b/main.py @@ -272,6 +272,20 @@ def _session(id): uids=uids, unames=unames, der=uptime()) + else if len(eventzeit) == 0 and len(eventname) == 0: + return render_template("session.html", + zeit=zeit, + aktivitaet=aktivitaet, + user=user, + eventname=eventname, + eventzeit=eventzeit, + game=game, + useranzahl=useranzahl, + creator=creator, + mate=mate, + uids=uids, + unames=unames, + der=uptime()) else: warning_log(" called /session without being logged in") From eaadd445a522644891d172eff14011cbf24f7f06 Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 17:34:25 +0100 Subject: [PATCH 054/126] elif > else if --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 0307da3..d329524 100644 --- a/main.py +++ b/main.py @@ -272,7 +272,7 @@ def _session(id): uids=uids, unames=unames, der=uptime()) - else if len(eventzeit) == 0 and len(eventname) == 0: + elif len(eventzeit) == 0 and len(eventname) == 0: return render_template("session.html", zeit=zeit, aktivitaet=aktivitaet, From 3cd8994a71488d8461af9d8d85ff7781a6684fa6 Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 17:39:32 +0100 Subject: [PATCH 055/126] remove session check --- main.py | 135 +++++++++++++++++++++++++++----------------------------- 1 file changed, 65 insertions(+), 70 deletions(-) diff --git a/main.py b/main.py index d329524..03ed557 100644 --- a/main.py +++ b/main.py @@ -209,87 +209,82 @@ def get_planer(): @app.route("/session/") def _session(id): - if session: - log_server(f"called /session/{id}") - con = sqlite3.connect("party.db") - cur = con.cursor() - l = f"SELECT eventname FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" - eventname = cur.execute(l).fetchall() - con.commit() + log_server(f"called /session/{id}") + con = sqlite3.connect("party.db") + cur = con.cursor() + l = f"SELECT eventname FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" + eventname = cur.execute(l).fetchall() + con.commit() - l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" - eventzeit = cur.execute(l).fetchall() - print (eventzeit) - #eventtime = re.split(',', eventzeit) - con.commit() - - creator = cur.execute("SELECT username FROM user WHERE info = 'Host'").fetchall() - con.commit() + l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" + eventzeit = cur.execute(l).fetchall() + print (eventzeit) + #eventtime = re.split(',', eventzeit) + con.commit() - l = f"SELECT count(username) FROM user WHERE sessionID = \'{id}\';" - useranzahl = cur.execute(l).fetchall() + creator = cur.execute("SELECT username FROM user WHERE info = 'Host'").fetchall() + con.commit() - l = f"SELECT matename, mateanzahl FROM mate WHERE sessionID = \'{id}\' ORDER BY mateanzahl;" - mate = cur.execute(l).fetchall() - con.commit() + l = f"SELECT count(username) FROM user WHERE sessionID = \'{id}\';" + useranzahl = cur.execute(l).fetchall() - l = f"SELECT Spielname FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" - game = cur.execute(l).fetchall() - con.commit() + l = f"SELECT matename, mateanzahl FROM mate WHERE sessionID = \'{id}\' ORDER BY mateanzahl;" + mate = cur.execute(l).fetchall() + con.commit() - l = f"SELECT userID FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" - user = cur.execute(l).fetchall() - con.commit() + l = f"SELECT Spielname FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" + game = cur.execute(l).fetchall() + con.commit() - l = f"SELECT Spielaktivität FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" - aktivitaet = cur.execute(l).fetchall() - con.commit() + l = f"SELECT userID FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" + user = cur.execute(l).fetchall() + con.commit() - l = f"SELECT username FROM user WHERE sessionID = \'{id}\';" - unames = cur.execute(l).fetchall() - con.commit() + l = f"SELECT Spielaktivität FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" + aktivitaet = cur.execute(l).fetchall() + con.commit() - l = f"SELECT userID FROM user WHERE sessionID = \'{id}\';" - uids = cur.execute(l).fetchall() - con.commit() + l = f"SELECT username FROM user WHERE sessionID = \'{id}\';" + unames = cur.execute(l).fetchall() + con.commit() - l = f"SELECT ZEIT FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" - zeit = cur.execute(l).fetchall() - con.commit() - cur.close() + l = f"SELECT userID FROM user WHERE sessionID = \'{id}\';" + uids = cur.execute(l).fetchall() + con.commit() - if len(eventzeit) > 0 and len(eventname) > 0: - return render_template("session.html", - zeit=zeit, - aktivitaet=aktivitaet, - user=user, - eventname=eventname[0], - eventzeit=eventzeit[0], - game=game, - useranzahl=useranzahl, - creator=creator, - mate=mate, - uids=uids, - unames=unames, - der=uptime()) - elif len(eventzeit) == 0 and len(eventname) == 0: - return render_template("session.html", - zeit=zeit, - aktivitaet=aktivitaet, - user=user, - eventname=eventname, - eventzeit=eventzeit, - game=game, - useranzahl=useranzahl, - creator=creator, - mate=mate, - uids=uids, - unames=unames, - der=uptime()) + l = f"SELECT ZEIT FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" + zeit = cur.execute(l).fetchall() + con.commit() + cur.close() - else: - warning_log(" called /session without being logged in") - return render_template('passwd.html') + if len(eventzeit) > 0 and len(eventname) > 0: + return render_template("session.html", + zeit=zeit, + aktivitaet=aktivitaet, + user=user, + eventname=eventname[0], + eventzeit=eventzeit[0], + game=game, + useranzahl=useranzahl, + creator=creator, + mate=mate, + uids=uids, + unames=unames, + der=uptime()) + elif len(eventzeit) == 0 and len(eventname) == 0: + return render_template("session.html", + zeit=zeit, + aktivitaet=aktivitaet, + user=user, + eventname=eventname, + eventzeit=eventzeit, + game=game, + useranzahl=useranzahl, + creator=creator, + mate=mate, + uids=uids, + unames=unames, + der=uptime()) @app.route("/mate", methods=['POST']) From d739bf4531b345f6d0d11f829ae032956ba9715f Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 17:43:20 +0100 Subject: [PATCH 056/126] removed 1 session check lool --- main.py | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/main.py b/main.py index 03ed557..26cea2c 100644 --- a/main.py +++ b/main.py @@ -180,31 +180,26 @@ def message(): # planer @app.route("/get_planer", methods=['POST']) def get_planer(): - if session: - log_server("called /get_planer") - log_server("called /get_planer with POST") - event = request.form['event'] - sessionID = request.form['sessionID'] - zeit = request.form['zeit'] - pfad = "/session/" + sessionID - status = "running" - l = f"INSERT INTO planer VALUES( \'{event}\', \'{zeit}\', \'{sessionID}\',\'{status}\');" - log_server("neues Event") - try: - con = sqlite3.connect("party.db") - warning_log("verbindung mit db wurde aufgenommen") - cur = con.cursor() - cur.execute(l) - con.commit() - con.close() - log_server("event entered successfully /get_planer") - except Exception: - error_log("unable to insert event") - return redirect(f'/session/{sessionID}') - - else: - warning_log(" called /get_planer without being logged in") - return render_template('404.html') + log_server("called /get_planer") + log_server("called /get_planer with POST") + event = request.form['event'] + sessionID = request.form['sessionID'] + zeit = request.form['zeit'] + pfad = "/session/" + sessionID + status = "running" + l = f"INSERT INTO planer VALUES( \'{event}\', \'{zeit}\', \'{sessionID}\',\'{status}\');" + log_server("neues Event") + try: + con = sqlite3.connect("party.db") + warning_log("verbindung mit db wurde aufgenommen") + cur = con.cursor() + cur.execute(l) + con.commit() + con.close() + log_server("event entered successfully /get_planer") + except Exception: + error_log("unable to insert event") + return redirect(f'/session/{sessionID}') @app.route("/session/") From 94b4e0c0109e17e89603d080871597eb58401ef0 Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 17:52:01 +0100 Subject: [PATCH 057/126] for event --- main.py | 47 +++++++++++++++++------------------------- templates/session.html | 6 ++++-- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/main.py b/main.py index 26cea2c..bc39d61 100644 --- a/main.py +++ b/main.py @@ -252,34 +252,25 @@ def _session(id): con.commit() cur.close() - if len(eventzeit) > 0 and len(eventname) > 0: - return render_template("session.html", - zeit=zeit, - aktivitaet=aktivitaet, - user=user, - eventname=eventname[0], - eventzeit=eventzeit[0], - game=game, - useranzahl=useranzahl, - creator=creator, - mate=mate, - uids=uids, - unames=unames, - der=uptime()) - elif len(eventzeit) == 0 and len(eventname) == 0: - return render_template("session.html", - zeit=zeit, - aktivitaet=aktivitaet, - user=user, - eventname=eventname, - eventzeit=eventzeit, - game=game, - useranzahl=useranzahl, - creator=creator, - mate=mate, - uids=uids, - unames=unames, - der=uptime()) + class eventData: + def __init__(self, evn, evz): + self.eventname = evn + self.eventzeit = evz + + eventdata = eventData(eventname, eventzeit) + + return render_template("session.html", + zeit=zeit, + aktivitaet=aktivitaet, + user=user, + eventdata=eventdata, + game=game, + useranzahl=useranzahl, + creator=creator, + mate=mate, + uids=uids, + unames=unames, + der=uptime()) @app.route("/mate", methods=['POST']) diff --git a/templates/session.html b/templates/session.html index e12b95d..5001d6d 100644 --- a/templates/session.html +++ b/templates/session.html @@ -56,9 +56,11 @@ Status - {{ eventname }} - {{ eventzeit }} + {% for event in eventdata } + {{ event.eventname }} + {{ event.eventzeit }} Status + {% endfor }

Füge ein Event ein

From f7f5890ea06f465f730e876b92c60045b7d77a46 Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 17:52:47 +0100 Subject: [PATCH 058/126] % --- templates/session.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/session.html b/templates/session.html index 5001d6d..fd17ea3 100644 --- a/templates/session.html +++ b/templates/session.html @@ -56,11 +56,11 @@ Status - {% for event in eventdata } + {% for event in eventdata %} {{ event.eventname }} {{ event.eventzeit }} Status - {% endfor } + {% endfor %}

Füge ein Event ein

From afdaa6079e33fb0d6c80cb2d91286ee35e037288 Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 18:00:26 +0100 Subject: [PATCH 059/126] fix bug --- templates/session.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/session.html b/templates/session.html index fd17ea3..8532f13 100644 --- a/templates/session.html +++ b/templates/session.html @@ -56,9 +56,9 @@ Status - {% for event in eventdata %} - {{ event.eventname }} - {{ event.eventzeit }} + {% for i in range(eventdata.eventname|length) %} + {{ eventdata.eventname[i] }} + {{ eventdata.eventzeit[i] }} Status {% endfor %} From df24f1be3a39a8c2ea340a4630162aaa185a9ecb Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 18:01:49 +0100 Subject: [PATCH 060/126] vertical --- templates/session.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/session.html b/templates/session.html index 8532f13..36a9b39 100644 --- a/templates/session.html +++ b/templates/session.html @@ -55,13 +55,13 @@ Zeit Status + {% for i in range(eventdata.eventname|length) %} - {% for i in range(eventdata.eventname|length) %} {{ eventdata.eventname[i] }} {{ eventdata.eventzeit[i] }} Status - {% endfor %} + {% endfor %}

Füge ein Event ein

From af2d40ad22afd885a761656a3dce654074342e40 Mon Sep 17 00:00:00 2001 From: hyperbel Date: Fri, 23 Dec 2022 18:05:58 +0100 Subject: [PATCH 061/126] list compr --- main.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index bc39d61..f514c40 100644 --- a/main.py +++ b/main.py @@ -208,12 +208,11 @@ def _session(id): con = sqlite3.connect("party.db") cur = con.cursor() l = f"SELECT eventname FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" - eventname = cur.execute(l).fetchall() + eventname = [i[0] for i in cur.execute(l).fetchall()] con.commit() l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" - eventzeit = cur.execute(l).fetchall() - print (eventzeit) + eventzeit = [i[0] for i in cur.execute(l).fetchall()] #eventtime = re.split(',', eventzeit) con.commit() From 39363a227287c04d058a25807a08a340e6014a17 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 23 Dec 2022 19:12:04 +0100 Subject: [PATCH 062/126] game --- main.py | 75 +++++++++++++++++------------------------- templates/session.html | 10 +++--- 2 files changed, 36 insertions(+), 49 deletions(-) diff --git a/main.py b/main.py index f514c40..997e396 100644 --- a/main.py +++ b/main.py @@ -130,7 +130,7 @@ def index(): # Neue Nachrichten @app.route("/get_chat", methods=['POST']) def get_chat(): - if session: + log_server("called /get_chat") log_server("called /get_chat with POST") userID = request.form['userid'] @@ -146,9 +146,7 @@ def get_chat(): error_log("unable to get new Messages") # account = cursor.fetchone() return render_template("chat.html") - else: - warning_log(" called /get_chat without being logged in") - return "{ \"message\": \"you need to login\"'}" + @app.route("/get_game_file", methods=['POST']) @@ -159,22 +157,16 @@ def get_game_file(): @app.route("/get_new_message") def get_new_message(): - if session: + log_server("called /get_new_message") return render_template("chat.html") - else: - warning_log(" called /get_new_message without being logged in") - return render_template('passwd.html') - - + @app.route("/message") def message(): - if session: + log_server("called /message") return render_template("message.html") - else: - warning_log(" called /message without being logged in") - return render_template('passwd.html') + # planer @@ -255,7 +247,16 @@ def _session(id): def __init__(self, evn, evz): self.eventname = evn self.eventzeit = evz + + class gameData: + def __init__(self, ga, akt, usr, ze): + self.game = ga + self.aktivitaet = akt + self.user = usr + self.zeit = ze + + gameda = gameData(game, aktivitaet, user, zeit) eventdata = eventData(eventname, eventzeit) return render_template("session.html", @@ -263,6 +264,7 @@ def _session(id): aktivitaet=aktivitaet, user=user, eventdata=eventdata, + gameda=gameda, game=game, useranzahl=useranzahl, creator=creator, @@ -274,9 +276,9 @@ def _session(id): @app.route("/mate", methods=['POST']) def mate(): - log_server("called /mate") + log_server("called /mate") - if session: + mateFlaschen = request.form['mateFlaschen'] sessionId = request.form['sessionID'] mateSorte = request.form['mateSorte'] @@ -320,15 +322,13 @@ def mate(): except sqlite3.Error as e: error_log(f"error while executing sql: {e}") return redirect(f'/session/{sessionId}') - else: - warning_log(" called /mate without being logged in") - return render_template('/passwd') + @app.route("/drink", methods=['POST']) def drink(): - log_server("called /drink") + log_server("called /drink") - if session: + mateFlaschen = request.form['mateFlaschen'] sessionId = request.form['sessionID'] mateSorte = request.form['mateSorte'] @@ -347,9 +347,7 @@ def drink(): except sqlite3.Error as e: error_log(f"error while executing sql: {e}") return redirect(f'/session/{sessionId}') - else: - warning_log(" called /mate without being logged in") - return render_template('/passwd') + @app.route("/logout") @@ -436,7 +434,7 @@ def login(): @app.route("/stopuhr", methods=['POST']) def stopuhr(): - if session: + log_server("called /stopuhr") spielName = request.form['spiel'] art = request.form['art'] @@ -451,14 +449,12 @@ def stopuhr(): except Exception: error_log("unable to run sql /stopuhr") return redirect(f'/session/{sessionId}') - else: - warning_log(" called /stopuhr without being logged in") - return render_template('passwd.html') + @app.route("/get_event", methods=['POST']) def get_event(): - if session: + log_server("called /get_event") event = request.form['event'] zeit = request.form['zeit'] @@ -475,40 +471,29 @@ def get_event(): except e: error_log("unable to run sql /get_event") return render_template("login.html") - else: - warning_log(" called /get_event without being logged in") - return render_template('passwd.html') + @app.route("/controll") def controll(): - if session: + log_server("called /controll") return render_template("controll.html") - else: - warning_log(" called /controll without being logged in") - return render_template('passwd.html') - + @app.route("/game") def game(): - if session: + log_server("called /game") return render_template("game.html") - else: - warning_log(" called /game without being logged in") - return render_template('passwd.html') @app.route("/rgb") def rgb(): - if session: + log_server("called /rgb") return render_template("404.html") - else: - warning_log(" called /rgb without being logged in") - return render_template('passwd.html') @app.route("/get_login", methods=['POST']) diff --git a/templates/session.html b/templates/session.html index 36a9b39..0b32a38 100644 --- a/templates/session.html +++ b/templates/session.html @@ -118,12 +118,14 @@ Aktivität Zeit + {% for i in range(eventdata.eventname|length) %} - {{ user }} - {{ game }} - {{ aktivitaet }} - {{ zeit }} + {{ gameda.user[i] }} + {{ gameda.game[i] }} + {{ gameda.aktivitaet[i] }} + {{ gameda.zeit[i] }} + {% endfor %} From 429616a5422299a054f39a1e4b081709f8f19b08 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 23 Dec 2022 19:14:05 +0100 Subject: [PATCH 063/126] fix? --- main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index 997e396..43e428e 100644 --- a/main.py +++ b/main.py @@ -219,15 +219,15 @@ def _session(id): con.commit() l = f"SELECT Spielname FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" - game = cur.execute(l).fetchall() + game = [i[0] for i in cur.execute(l).fetchall()] con.commit() l = f"SELECT userID FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" - user = cur.execute(l).fetchall() + user = [i[0] for i in cur.execute(l).fetchall()] con.commit() l = f"SELECT Spielaktivität FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" - aktivitaet = cur.execute(l).fetchall() + aktivitaet = [i[0] for i in cur.execute(l).fetchall()] con.commit() l = f"SELECT username FROM user WHERE sessionID = \'{id}\';" @@ -239,7 +239,7 @@ def _session(id): con.commit() l = f"SELECT ZEIT FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" - zeit = cur.execute(l).fetchall() + zeit = [i[0] for i in cur.execute(l).fetchall()] con.commit() cur.close() From 4dba7e8584701c45cd03afa49e0f194c2705a9f5 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 23 Dec 2022 19:16:47 +0100 Subject: [PATCH 064/126] leerzeilen --- main.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/main.py b/main.py index 43e428e..79ec074 100644 --- a/main.py +++ b/main.py @@ -147,14 +147,11 @@ def get_chat(): # account = cursor.fetchone() return render_template("chat.html") - - @app.route("/get_game_file", methods=['POST']) def get_game_file(): log_server("called /get_game_file") pick() - @app.route("/get_new_message") def get_new_message(): @@ -167,8 +164,6 @@ def message(): log_server("called /message") return render_template("message.html") - - # planer @app.route("/get_planer", methods=['POST']) def get_planer(): From dd235d35c1f248a3aae6edba94120cc724d5b637 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 23 Dec 2022 19:22:50 +0100 Subject: [PATCH 065/126] =?UTF-8?q?game=20tabelle=20l=C3=A4uft?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/session.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/session.html b/templates/session.html index 0b32a38..103fc3b 100644 --- a/templates/session.html +++ b/templates/session.html @@ -118,7 +118,7 @@ Aktivität Zeit - {% for i in range(eventdata.eventname|length) %} + {% for i in range(gameda.user|length) %} {{ gameda.user[i] }} {{ gameda.game[i] }} From 53f43215b8ec5ffc15bd38ea4b122e1deaed756f Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Fri, 23 Dec 2022 19:31:17 +0100 Subject: [PATCH 066/126] tables --- main.py | 15 +++++++++++---- templates/session.html | 6 ++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 79ec074..99e862e 100644 --- a/main.py +++ b/main.py @@ -203,14 +203,14 @@ def _session(id): #eventtime = re.split(',', eventzeit) con.commit() - creator = cur.execute("SELECT username FROM user WHERE info = 'Host'").fetchall() + creator = [i[0] for i in cur.execute("SELECT username FROM user WHERE info = 'Host'").fetchall()] con.commit() l = f"SELECT count(username) FROM user WHERE sessionID = \'{id}\';" useranzahl = cur.execute(l).fetchall() l = f"SELECT matename, mateanzahl FROM mate WHERE sessionID = \'{id}\' ORDER BY mateanzahl;" - mate = cur.execute(l).fetchall() + mate = [i[0] for i in cur.execute(l).fetchall()] con.commit() l = f"SELECT Spielname FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" @@ -226,11 +226,11 @@ def _session(id): con.commit() l = f"SELECT username FROM user WHERE sessionID = \'{id}\';" - unames = cur.execute(l).fetchall() + unames = [i[0] for i in cur.execute(l).fetchall()] con.commit() l = f"SELECT userID FROM user WHERE sessionID = \'{id}\';" - uids = cur.execute(l).fetchall() + uids = [i[0] for i in cur.execute(l).fetchall()] con.commit() l = f"SELECT ZEIT FROM game WHERE sessionID = \'{id}\' ORDER BY ZEIT;" @@ -242,6 +242,11 @@ def _session(id): def __init__(self, evn, evz): self.eventname = evn self.eventzeit = evz + + class userData: + def __init__(self, us, usid): + self.unames = us + self.uids = usid class gameData: def __init__(self, ga, akt, usr, ze): @@ -253,6 +258,7 @@ def _session(id): gameda = gameData(game, aktivitaet, user, zeit) eventdata = eventData(eventname, eventzeit) + userdat = eventData(unames, uids) return render_template("session.html", zeit=zeit, @@ -260,6 +266,7 @@ def _session(id): user=user, eventdata=eventdata, gameda=gameda, + userdat=userdat, game=game, useranzahl=useranzahl, creator=creator, diff --git a/templates/session.html b/templates/session.html index 103fc3b..7ce3b03 100644 --- a/templates/session.html +++ b/templates/session.html @@ -234,12 +234,14 @@ User Status + {% for i in range(userdat.unames|length) %} - {{ uids }} - {{ unames }} + {{ userdat.unames[i] }} + {{ userdat.uids[i] }} Online + {% endfor %} From 4f68bd18c3481b6acffcf0135803f944517417e7 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 24 Dec 2022 06:30:25 +0100 Subject: [PATCH 067/126] pls work --- main.py | 3 +-- static/js/general.js | 3 +++ templates/createSession.html | 10 +++++++--- templates/login.html | 9 +++++++-- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index 99e862e..afe55fc 100644 --- a/main.py +++ b/main.py @@ -423,8 +423,7 @@ def get_creat_session(): create_qr(sessionID) return redirect(f'/session/{sessionID}') log_server("session successfully started") - except e: - error_log("unable to create Session") + except: return "{ \"message\": \"Login failed\"'}" diff --git a/static/js/general.js b/static/js/general.js index 33390a6..b315c56 100644 --- a/static/js/general.js +++ b/static/js/general.js @@ -20,3 +20,6 @@ document.getElementById("user").innerHTML = name; + + + diff --git a/templates/createSession.html b/templates/createSession.html index e976777..9da3f10 100644 --- a/templates/createSession.html +++ b/templates/createSession.html @@ -12,9 +12,8 @@
- - - + + @@ -36,6 +35,11 @@ let sessionname = document.getElementById("sessionName").value window.sessionStorage.setItem("session", sessionname) } + + function randomnumber1() { + rnumber = Math.floor(Math.random() * (max - min + 1) ) + min + document.getElementById("idIn").innerHTML = rnumber + } diff --git a/templates/login.html b/templates/login.html index 4098a88..8fbb9f0 100644 --- a/templates/login.html +++ b/templates/login.html @@ -60,12 +60,12 @@
- +

- +
@@ -104,6 +104,11 @@ let sessID = document.getElementById("name3").value window.sessionStorage.setItem("name", sessID) } + + function randomnumber(min, max) { + rnumber = Math.floor(Math.random() * (max - min + 1) ) + min + document.getElementById("Uid1").innerHTML = rnumber + } \ No newline at end of file From 25eeb333bc39200e92b8a9f646f5d04043064c54 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 24 Dec 2022 13:29:21 +0100 Subject: [PATCH 068/126] automatische IDS --- run.sh | 7 ++----- templates/createSession.html | 16 ++++++---------- templates/login.html | 8 ++------ 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/run.sh b/run.sh index 9cb0e8e..73a8aa4 100755 --- a/run.sh +++ b/run.sh @@ -5,11 +5,8 @@ if [ $? -eq 1 ]; then pip install qrcode fi -md5sum -c .sums -if [ $? -eq 1 ]; then - rm party.db - cat party.sql | sqlite3 party.db -fi + +cat party.sql | sqlite3 party.db export FLASK_APP=main.py diff --git a/templates/createSession.html b/templates/createSession.html index 9da3f10..b479c49 100644 --- a/templates/createSession.html +++ b/templates/createSession.html @@ -13,19 +13,14 @@ - + From 752d22fb3121913e251c2ef62a5ad69e184ea30c Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 24 Dec 2022 14:14:52 +0100 Subject: [PATCH 069/126] pointgame table & endpoint --- main.py | 19 +++++++++++++++++++ party.sql | 1 + templates/session.html | 43 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/main.py b/main.py index afe55fc..43f807d 100644 --- a/main.py +++ b/main.py @@ -450,6 +450,25 @@ def stopuhr(): except Exception: error_log("unable to run sql /stopuhr") return redirect(f'/session/{sessionId}') + + +@app.route("/pointGame", methods=['POST']) +def pointgame(): + + log_server("called /pointGame") + spielName = request.form['spiel'] + art = request.form['art'] + punkte = request.form['punkte'] + userId = request.form['userid'] + sessionId = request.form['sessionID'] + l = f"INSERT INTO pointgame VALUES( \'{sessionId}\', \'{userId}\',\'{spielName}\',\'{art}\', \'{punkte}\');" + try: + warning_log("verbindung mit Datenbank wurde aufgenommen") + dbcon(l) + log_server("time entered successfully /pointGame") + except Exception: + error_log("unable to run sql /pointGame") + return redirect(f'/session/{sessionId}') diff --git a/party.sql b/party.sql index 7d71c1d..020a5f9 100644 --- a/party.sql +++ b/party.sql @@ -3,6 +3,7 @@ CREATE TABLE user (userID INTEGER PRIMARY KEY,username TEXT, sessionID INTEGER N CREATE TABLE seession (sessionID INTEGER PRIMARY KEY, sessionname TEXT, sessionstatus TEXT, seessiontyp TEXT); CREATE TABLE chat (sessionID INTEGER, userID INTEGER, chatmessage TEXT, ZEIT TEXT); CREATE TABLE game (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielaktivität TEXT, ZEIT TEXT); +CREATE TABLE pointgame (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielaktivität TEXT, Punkte INTEGER); CREATE TABLE uploadgame (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielstand TEXT); CREATE TABLE planer (eventname TEXT, eventzeit TEXT, sessionID INTEGER, eventstatus TEXT); CREATE TABLE mate (matename TEXT, mateanzahl INTEGER, sessionID INTEGER); diff --git a/templates/session.html b/templates/session.html index 7ce3b03..08a76ae 100644 --- a/templates/session.html +++ b/templates/session.html @@ -107,6 +107,28 @@
+
+
+
+
+ + + + + + + +
+ +
+
+
@@ -128,6 +150,27 @@ {% endfor %} +
+
+
+ + + + + + + + + {% for i in range(gameda.user|length) %} + + + + + + + {% endfor %} +
SpielerGameAktivitätPunkte
{{ gameda.user[i] }}{{ gameda.game[i] }}{{ gameda.aktivitaet[i] }}{{ gameda.zeit[i] }}
+