Clean up enablers/disablers code and naming conventions.

[plomtask] / plomtask / http.py

diff --git a/plomtask/http.py b/plomtask/http.py
index a14233ae9cb81e0d65c18bbaf37497e63ab311e2..4bf58b41a2cb264a0a40bf018ee9c5536e358bda 100644 (file)
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -127,17 +127,17 @@ class TaskHandler(BaseHTTPRequestHandler):
                     'condition': condition,
                     'enablers': enablers,
                     'disablers': disablers}]
-        return {'day': Day.by_date(self.conn, date, create=True),
+        return {'day': Day.by_id(self.conn, date, create=True),
                 'todos': Todo.by_date(self.conn, date),
                 'processes': Process.all(self.conn),
                 'conditions_listing': conditions_listing}
 
     def do_GET_todo(self) -> dict[str, object]:
         """Show single Todo of ?id=."""
-        id_ = self.params.get_int_or_none('id')
+        id_ = self.params.get_int('id')
         todo = Todo.by_id(self.conn, id_)
         return {'todo': todo,
-                'todo_candidates': Todo.by_date(self.conn, todo.day.date),
+                'todo_candidates': Todo.by_date(self.conn, todo.date),
                 'condition_candidates': Condition.all(self.conn)}
 
     def do_GET_conditions(self) -> dict[str, object]:
@@ -187,31 +187,31 @@ class TaskHandler(BaseHTTPRequestHandler):
     def do_POST_day(self) -> None:
         """Update or insert Day of date and Todos mapped to it."""
         date = self.params.get_str('date')
-        day = Day.by_date(self.conn, date, create=True)
+        day = Day.by_id(self.conn, date, create=True)
         day.comment = self.form_data.get_str('comment')
         day.save(self.conn)
         process_id = self.form_data.get_int_or_none('new_todo')
         if process_id is not None:
             process = Process.by_id(self.conn, process_id)
-            todo = Todo(None, process, False, day)
+            todo = Todo(None, process, False, day.date)
             todo.save(self.conn)
 
     def do_POST_todo(self) -> None:
         """Update Todo and its children."""
-        id_ = self.params.get_int_or_none('id')
+        id_ = self.params.get_int('id')
         todo = Todo.by_id(self.conn, id_)
         child_id = self.form_data.get_int_or_none('adopt')
         if child_id is not None:
             child = Todo.by_id(self.conn, child_id)
             todo.add_child(child)
         todo.set_conditions(self.conn, self.form_data.get_all_int('condition'))
-        todo.set_fulfills(self.conn, self.form_data.get_all_int('fulfills'))
-        todo.set_undoes(self.conn, self.form_data.get_all_int('undoes'))
+        todo.set_enables(self.conn, self.form_data.get_all_int('enables'))
+        todo.set_disables(self.conn, self.form_data.get_all_int('disables'))
         todo.is_done = len(self.form_data.get_all_str('done')) > 0
         todo.save(self.conn)
-        for condition in todo.fulfills:
+        for condition in todo.enables:
             condition.save(self.conn)
-        for condition in todo.undoes:
+        for condition in todo.disables:
             condition.save(self.conn)
 
     def do_POST_process(self) -> None:
@@ -223,8 +223,8 @@ class TaskHandler(BaseHTTPRequestHandler):
         process.effort.set(self.form_data.get_float('effort'))
         process.set_conditions(self.conn,
                                self.form_data.get_all_int('condition'))
-        process.set_fulfills(self.conn, self.form_data.get_all_int('fulfills'))
-        process.set_undoes(self.conn, self.form_data.get_all_int('undoes'))
+        process.set_enables(self.conn, self.form_data.get_all_int('enables'))
+        process.set_disables(self.conn, self.form_data.get_all_int('disables'))
         process.save_core(self.conn)
         assert process.id_ is not None  # for mypy
         process.explicit_steps = []