Remove some redundant code.

[plomtask] / plomtask / http.py

diff --git a/plomtask/http.py b/plomtask/http.py
index 8106d13c3c9f5c65b16dd1df12705543e183d46e..e812471a9c8eb5bd0d0dccb6df1f5546ee16a20d 100644 (file)
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -4,18 +4,20 @@ from http.server import HTTPServer
 from urllib.parse import urlparse, parse_qs
 from os.path import split as path_split
 from jinja2 import Environment as JinjaEnv, FileSystemLoader as JinjaFSLoader
-from plomtask.days import Day
+from plomtask.days import Day, todays_date
 from plomtask.misc import HandledException
 from plomtask.db import DatabaseConnection
 
+TEMPLATES_DIR = 'templates'
+
 
 class TaskServer(HTTPServer):
     """Variant of HTTPServer that knows .jinja as Jinja Environment."""
 
-    def __init__(self, templates_dir, db_file, *args, **kwargs):
+    def __init__(self, db_file, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.db = db_file
-        self.jinja = JinjaEnv(loader=JinjaFSLoader(templates_dir))
+        self.jinja = JinjaEnv(loader=JinjaFSLoader(TEMPLATES_DIR))
 
 
 class TaskHandler(BaseHTTPRequestHandler):
@@ -27,9 +29,11 @@ class TaskHandler(BaseHTTPRequestHandler):
         try:
             conn, site, params = self._init_handling()
             if 'calendar' == site:
-                html = self.do_GET_calendar(conn)
+                start = params.get('start', [''])[0]
+                end = params.get('end', [''])[0]
+                html = self.do_GET_calendar(conn, start, end)
             elif 'day' == site:
-                date = params.get('date', ['2024-01-01'])[0]
+                date = params.get('date', [todays_date()])[0]
                 html = self.do_GET_day(conn, date)
             else:
                 raise HandledException('Test!')
@@ -39,14 +43,15 @@ class TaskHandler(BaseHTTPRequestHandler):
         except HandledException as error:
             self._send_msg(error)
 
-    def do_GET_calendar(self, conn: DatabaseConnection):
+    def do_GET_calendar(self, conn: DatabaseConnection, start: str, end: str):
         """Show Days."""
         return self.server.jinja.get_template('calendar.html').render(
-                days=Day.all(conn))
+                days=Day.all(conn, date_range=(start, end)),
+                start=start, end=end)
 
     def do_GET_day(self, conn: DatabaseConnection, date: str):
         """Show single Day."""
-        day = Day.by_date(conn, date)
+        day = Day.by_date(conn, date, create=True)
         return self.server.jinja.get_template('day.html').render(day=day)
 
     def do_POST(self):
@@ -57,7 +62,7 @@ class TaskHandler(BaseHTTPRequestHandler):
             postvars = parse_qs(self.rfile.read(length).decode(),
                                 keep_blank_values=1)
             if 'day' == site:
-                date = params.get('date', ['2024-01-01'])[0]
+                date = params.get('date', [None])[0]
                 self.do_POST_day(conn, date, postvars)
             conn.commit()
             conn.close()
@@ -67,9 +72,8 @@ class TaskHandler(BaseHTTPRequestHandler):
 
     def do_POST_day(self, conn: DatabaseConnection, date: str, postvars: dict):
         """Update or insert Day of date and fields defined in postvars."""
-        comment = postvars['comment'][0]
         day = Day.by_date(conn, date, create=True)
-        day.comment = comment
+        day.comment = postvars['comment'][0]
         day.save(conn)
 
     def _init_handling(self):