home · contact · privacy
Minor refactoring.
[plomtask] / plomtask / http.py
index 3710595d6c51378426c4575656d14c641dc125ef..5d165ecf90f1ca6ebaed77e55b73a5d55ff428b8 100644 (file)
@@ -10,6 +10,7 @@ from plomtask.exceptions import HandledException, BadFormatException, \
         NotFoundException
 from plomtask.db import DatabaseConnection, DatabaseFile
 from plomtask.processes import Process
+from plomtask.todos import Todo
 
 TEMPLATES_DIR = 'templates'
 
@@ -70,6 +71,13 @@ class PostvarsParser:
             msg = f'cannot int form field value: {val}'
             raise BadFormatException(msg) from e
 
+    def get_int_or_none(self, key: str) -> int | None:
+        """Retrieve int value of key from self.postvars, or None."""
+        if key not in self.postvars or \
+                0 == len(''.join(list(self.postvars[key]))):
+            return None
+        return self.get_int(key)
+
     def get_float(self, key: str) -> float:
         """Retrieve float value of key from self.postvars."""
         val = self.get_str(key)
@@ -103,17 +111,18 @@ class TaskHandler(BaseHTTPRequestHandler):
         """Handle any GET request."""
         try:
             conn, site, params = self._init_handling()
-            if site in {'calendar', 'day', 'process', 'processes'}:
+            if site in {'calendar', 'day', 'process', 'processes', 'todo'}:
                 html = getattr(self, f'do_GET_{site}')(conn, params)
             elif '' == site:
                 self._redirect('/day')
                 return
             else:
                 raise NotFoundException(f'Unknown page: /{site}')
-            conn.close()
             self._send_html(html)
         except HandledException as error:
             self._send_msg(error, code=error.http_code)
+        finally:
+            conn.close()
 
     def do_GET_calendar(self, conn: DatabaseConnection,
                         params: ParamsParser) -> str:
@@ -129,16 +138,28 @@ class TaskHandler(BaseHTTPRequestHandler):
         """Show single Day of ?date=."""
         date = params.get_str('date', todays_date())
         day = Day.by_date(conn, date, create=True)
-        return self.server.jinja.get_template('day.html').render(day=day)
+        todos = Todo.by_date(conn, date)
+        return self.server.jinja.get_template('day.html').render(
+                day=day, processes=Process.all(conn), todos=todos)
+
+    def do_GET_todo(self, conn: DatabaseConnection, params:
+                    ParamsParser) -> str:
+        """Show single Todo of ?id=."""
+        id_ = params.get_int_or_none('id')
+        todo = Todo.by_id(conn, id_)
+        candidates = Todo.by_date(conn, todo.day.date)
+        return self.server.jinja.get_template('todo.html').render(
+                todo=todo, candidates=candidates)
 
     def do_GET_process(self, conn: DatabaseConnection,
                        params: ParamsParser) -> str:
         """Show process of ?id=."""
         id_ = params.get_int_or_none('id')
         process = Process.by_id(conn, id_, create=True)
+        owners = process.used_as_step_by(conn)
         return self.server.jinja.get_template('process.html').render(
-                process=process, children=process.children(conn),
-                candidates=Process.all(conn))
+                process=process, steps=process.get_steps(conn),
+                owners=owners, candidates=Process.all(conn))
 
     def do_GET_processes(self, conn: DatabaseConnection,
                          _: ParamsParser) -> str:
@@ -154,24 +175,42 @@ class TaskHandler(BaseHTTPRequestHandler):
             postvars = parse_qs(self.rfile.read(length).decode(),
                                 keep_blank_values=True, strict_parsing=True)
             form_data = PostvarsParser(postvars)
-            if site in ('day', 'process'):
+            if site in ('day', 'process', 'todo'):
                 getattr(self, f'do_POST_{site}')(conn, params, form_data)
                 conn.commit()
             else:
                 msg = f'Page not known as POST target: /{site}'
                 raise NotFoundException(msg)
-            conn.close()
             self._redirect('/')
         except HandledException as error:
             self._send_msg(error, code=error.http_code)
+        finally:
+            conn.close()
 
     def do_POST_day(self, conn: DatabaseConnection, params: ParamsParser,
                     form_data: PostvarsParser) -> None:
-        """Update or insert Day of date and fields defined in postvars."""
+        """Update or insert Day of date and Todos mapped to it."""
         date = params.get_str('date')
         day = Day.by_date(conn, date, create=True)
         day.comment = form_data.get_str('comment')
         day.save(conn)
+        process_id = form_data.get_int_or_none('new_todo')
+        if process_id is not None:
+            process = Process.by_id(conn, process_id)
+            todo = Todo(None, process, False, day)
+            todo.save(conn)
+
+    def do_POST_todo(self, conn: DatabaseConnection, params: ParamsParser,
+                     form_data: PostvarsParser) -> None:
+        """Update Todo and its children."""
+        id_ = params.get_int_or_none('id')
+        todo = Todo.by_id(conn, id_)
+        child_id = form_data.get_int_or_none('adopt')
+        if child_id is not None:
+            child = Todo.by_id(conn, child_id)
+            todo.add_child(child)
+        todo.is_done = len(form_data.get_all_str('done')) > 0
+        todo.save(conn)
 
     def do_POST_process(self, conn: DatabaseConnection, params: ParamsParser,
                         form_data: PostvarsParser) -> None:
@@ -181,8 +220,21 @@ class TaskHandler(BaseHTTPRequestHandler):
         process.title.set(form_data.get_str('title'))
         process.description.set(form_data.get_str('description'))
         process.effort.set(form_data.get_float('effort'))
-        process.child_ids = form_data.get_all_int('children')
-        process.save(conn)
+        process.save_without_steps(conn)
+        assert process.id_ is not None  # for mypy
+        process.explicit_steps = []
+        for step_id in form_data.get_all_int('steps'):
+            for step_process_id in\
+                    form_data.get_all_int(f'new_step_to_{step_id}'):
+                process.add_step(conn, None, step_process_id, step_id)
+            if step_id not in form_data.get_all_int('keep_step'):
+                continue
+            step_process_id = form_data.get_int(f'step_{step_id}_process_id')
+            parent_id = form_data.get_int_or_none(f'step_{step_id}_parent_id')
+            process.add_step(conn, step_id, step_process_id, parent_id)
+        for step_process_id in form_data.get_all_int('new_top_step'):
+            process.add_step(conn, None, step_process_id, None)
+        process.fix_steps(conn)
 
     def _init_handling(self) -> tuple[DatabaseConnection, str, ParamsParser]:
         conn = DatabaseConnection(self.server.db)