From 9b35bc784536cd66526e5711424d10913cb41f0a Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 23 Mar 2020 23:45:50 +0100
Subject: [PATCH] App is installable
---
TODO | 11 ++++++-----
app/Makefile | 5 +++++
app/zoom.py | 11 ++++++-----
3 files changed, 17 insertions(+), 10 deletions(-)
create mode 100644 app/Makefile
diff --git a/TODO b/TODO
index 6f50a1d..89926a9 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,9 @@
-- Number of workers
-- Access rights
-- Reloading
-- Ztlumit logování
+DB:
- Trigger na "last modified" u meetingů
+- indexy
+
+Hook:
+- Adjust number of workers
+- Ztlumit logování
- hooky na create/delete user
- přehlednější log
-- indexy
diff --git a/app/Makefile b/app/Makefile
new file mode 100644
index 0000000..468b70f
--- /dev/null
+++ b/app/Makefile
@@ -0,0 +1,5 @@
+DEST=/srv/mffzoom/app
+
+install:
+ rsync -av --delete zoom.py templates $(DEST)/
+ touch $(DEST)/force-reload
diff --git a/app/zoom.py b/app/zoom.py
index 1597699..c6fd979 100644
--- a/app/zoom.py
+++ b/app/zoom.py
@@ -107,12 +107,13 @@ def main_page():
# XXX: No meeting is ever longer than 24 hours
db_query("""
- SELECT m.meeting_id, m.topic, m.start_time, m.duration, u.email, u.full_name
+ SELECT m.meeting_id, m.topic, s.start_time, s.duration, u.email, u.full_name
FROM zoom_meetings m
- JOIN zoom_users u ON u.id = m.host_id
- WHERE m.start_time >= DATE %s - INTERVAL '1 day'
- AND m.start_time < DATE %s + INTERVAL '1 day'
- ORDER BY u.email, m.start_time
+ JOIN zoom_users u ON u.uid = m.host_uid
+ JOIN zoom_schedule s ON s.mid = m.mid
+ WHERE s.start_time >= DATE %s - INTERVAL '1 day'
+ AND s.start_time < DATE %s + INTERVAL '1 day'
+ ORDER BY u.email, s.start_time
""",
(dt, dt))
--
GitLab