X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;ds=sidebyside;f=plomtask%2Fhttp.py;h=9a68221998ea81deea78a2770ac9a2f0e3bef470;hb=8310bdb39e4f3cba5ac90be1ec57b3df633f436b;hp=d9fa6a03194d1838fcf36f8cc860a4eab0baf6ac;hpb=abef15c28141490af71a1b8a11882aaabc0d3775;p=plomtask

diff --git a/plomtask/http.py b/plomtask/http.py
index d9fa6a0..9a68221 100644
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -4,18 +4,21 @@ 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
+from plomtask.processes import Process
+
+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):
@@ -25,15 +28,23 @@ class TaskHandler(BaseHTTPRequestHandler):
     def do_GET(self):
         """Handle any GET request."""
         try:
-            conn = DatabaseConnection(self.server.db)
-            parsed_url = urlparse(self.path)
-            site = path_split(parsed_url.path)[1]
-            params = parse_qs(parsed_url.query)
+            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)
+            elif 'process' == site:
+                id_ = params.get('id', [None])[0]
+                try:
+                    id_ = int(id_) if id_ else None
+                except ValueError as e:
+                    raise HandledException(f'Bad ?id= value: {id_}') from e
+                html = self.do_GET_process(conn, id_)
+            elif 'processes' == site:
+                html = self.do_GET_processes(conn)
             else:
                 raise HandledException('Test!')
             conn.commit()
@@ -42,29 +53,44 @@ 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."""
+        days = Day.all(conn, date_range=(start, end), fill_gaps=True)
         return self.server.jinja.get_template('calendar.html').render(
-                days=Day.all(conn))
+                days=days, 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_GET_process(self, conn: DatabaseConnection, id_: int | None):
+        """Show process of id_."""
+        return self.server.jinja.get_template('process.html').render(
+                process=Process.by_id(conn, id_, create=True))
+
+    def do_GET_processes(self, conn: DatabaseConnection):
+        """Show all Processes."""
+        return self.server.jinja.get_template('processes.html').render(
+                processes=Process.all(conn))
+
     def do_POST(self):
         """Handle any POST request."""
         try:
-            conn = DatabaseConnection(self.server.db)
-            parsed_url = urlparse(self.path)
-            site = path_split(parsed_url.path)[1]
-            params = parse_qs(parsed_url.query)
+            conn, site, params = self._init_handling()
             length = int(self.headers['content-length'])
             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)
+            elif 'process' == site:
+                id_ = params.get('id', [None])[0]
+                try:
+                    id_ = int(id_) if id_ else None
+                except ValueError as e:
+                    raise HandledException(f'Bad ?id= value: {id_}') from e
+                self.do_POST_process(conn, id_, postvars)
             conn.commit()
             conn.close()
             self._redirect('/')
@@ -73,14 +99,31 @@ 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)
-        if day:
-            day.comment = comment
-        else:
-            day = Day(date, comment)
+        day = Day.by_date(conn, date, create=True)
+        day.comment = postvars['comment'][0]
         day.save(conn)
 
+    def do_POST_process(self, conn: DatabaseConnection, id_: int | None,
+                        postvars: dict):
+        """Update or insert Process of id_ and fields defined in postvars."""
+        process = Process.by_id(conn, id_, create=True)
+        if process:
+            process.title.set(postvars['title'][0])
+            process.description.set(postvars['description'][0])
+            effort = postvars['effort'][0]
+            try:
+                process.effort.set(float(effort))
+            except ValueError as e:
+                raise HandledException(f'Bad effort value: {effort}') from e
+            process.save(conn)
+
+    def _init_handling(self):
+        conn = DatabaseConnection(self.server.db)
+        parsed_url = urlparse(self.path)
+        site = path_split(parsed_url.path)[1]
+        params = parse_qs(parsed_url.query)
+        return conn, site, params
+
     def _redirect(self, target: str):
         self.send_response(302)
         self.send_header('Location', target)