X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=080af8ce1a127880368c8c4bedb3cf4e0aebaffc;hb=e150bee233a648950061b716dc1780581105ede6;hp=2c7e628bdd14fd572a29c5686a5d3a5a37ceb409;hpb=29969c2d0fb6c464662737df1da94f76dc2c0982;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 2c7e628..080af8c 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -94,9 +94,7 @@ class TaskHandler(BaseHTTPRequestHandler): """Handle any GET request.""" try: self._init_handling() - if self.site in {'calendar', 'day', 'process', 'process_titles', - 'process_descriptions', 'process_efforts', - 'processes', 'todo', 'condition', 'conditions'}: + if hasattr(self, f'do_GET_{self.site}'): template = f'{self.site}.html' ctx = getattr(self, f'do_GET_{self.site}')() html = self.server.jinja.get_template(template).render(**ctx) @@ -115,6 +113,8 @@ class TaskHandler(BaseHTTPRequestHandler): start = self.params.get_str('start') end = self.params.get_str('end') days = Day.all(self.conn, date_range=(start, end), fill_gaps=True) + for day in days: + day.collect_calendarized_todos(self.conn) return {'start': start, 'end': end, 'days': days} def do_GET_day(self) -> dict[str, object]: @@ -149,13 +149,35 @@ class TaskHandler(BaseHTTPRequestHandler): def do_GET_conditions(self) -> dict[str, object]: """Show all Conditions.""" - return {'conditions': Condition.all(self.conn)} + conditions = Condition.all(self.conn) + sort_by = self.params.get_str('sort_by') + if sort_by == 'is_active': + conditions.sort(key=lambda c: c.is_active) + elif sort_by == '-is_active': + conditions.sort(key=lambda c: c.is_active, reverse=True) + elif sort_by == '-title': + conditions.sort(key=lambda c: c.title.newest, reverse=True) + else: + conditions.sort(key=lambda c: c.title.newest) + return {'conditions': conditions, 'sort_by': sort_by} def do_GET_condition(self) -> dict[str, object]: """Show Condition of ?id=.""" id_ = self.params.get_int_or_none('id') return {'condition': Condition.by_id(self.conn, id_, create=True)} + def do_GET_condition_titles(self) -> dict[str, object]: + """Show title history of Condition of ?id=.""" + id_ = self.params.get_int_or_none('id') + condition = Condition.by_id(self.conn, id_) + return {'condition': condition} + + def do_GET_condition_descriptions(self) -> dict[str, object]: + """Show description historys of Condition of ?id=.""" + id_ = self.params.get_int_or_none('id') + condition = Condition.by_id(self.conn, id_) + return {'condition': condition} + def do_GET_process(self) -> dict[str, object]: """Show Process of ?id=.""" id_ = self.params.get_int_or_none('id') @@ -186,7 +208,17 @@ class TaskHandler(BaseHTTPRequestHandler): def do_GET_processes(self) -> dict[str, object]: """Show all Processes.""" - return {'processes': Process.all(self.conn)} + processes = Process.all(self.conn) + sort_by = self.params.get_str('sort_by') + if sort_by == 'steps': + processes.sort(key=lambda c: len(c.explicit_steps)) + elif sort_by == '-steps': + processes.sort(key=lambda c: len(c.explicit_steps), reverse=True) + elif sort_by == '-title': + processes.sort(key=lambda c: c.title.newest, reverse=True) + else: + processes.sort(key=lambda c: c.title.newest) + return {'processes': processes, 'sort_by': sort_by} def do_POST(self) -> None: """Handle any POST request.""" @@ -197,7 +229,7 @@ class TaskHandler(BaseHTTPRequestHandler): postvars = parse_qs(self.rfile.read(length).decode(), keep_blank_values=True, strict_parsing=True) self.form_data = InputsParser(postvars) - if self.site in ('day', 'process', 'todo', 'condition'): + if hasattr(self, f'do_POST_{self.site}'): redir_target = getattr(self, f'do_POST_{self.site}')() self.conn.commit() else: @@ -232,11 +264,14 @@ class TaskHandler(BaseHTTPRequestHandler): todo.save(self.conn) done_ids = self.form_data.get_all_int('done') comments = self.form_data.get_all_str('comment') + efforts = self.form_data.get_all_str('effort') for i, todo_id in enumerate(self.form_data.get_all_int('todo_id')): todo = Todo.by_id(self.conn, todo_id) todo.is_done = todo_id in done_ids if len(comments) > 0: todo.comment = comments[i] + if len(efforts) > 0: + todo.effort = float(efforts[i]) if efforts[i] else None todo.save(self.conn) for condition in todo.enables: condition.save(self.conn) @@ -263,10 +298,13 @@ class TaskHandler(BaseHTTPRequestHandler): continue child = Todo.by_id(self.conn, child_id) todo.add_child(child) + effort = self.form_data.get_str('effort', ignore_strict=True) + todo.effort = float(effort) if effort else None todo.set_conditions(self.conn, self.form_data.get_all_int('condition')) 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.calendarize = len(self.form_data.get_all_str('calendarize')) > 0 todo.comment = self.form_data.get_str('comment', ignore_strict=True) todo.save(self.conn) for condition in todo.enables: @@ -290,6 +328,7 @@ class TaskHandler(BaseHTTPRequestHandler): self.form_data.get_all_int('condition')) 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.calendarize = self.form_data.get_all_str('calendarize') != [] process.save(self.conn) process.explicit_steps = [] steps: list[tuple[int | None, int, int | None]] = []