From e49ef886fbe6308db338f025d21f9cb9a3901240 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Wed, 24 Apr 2024 19:47:49 +0200 Subject: [PATCH] Minor code style improvement re NamedTuple usage. --- plomtask/http.py | 24 ++++++++++++++---------- templates/day.html | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/plomtask/http.py b/plomtask/http.py index 8f247cd..d7be135 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -1,6 +1,5 @@ """Web server stuff.""" -from typing import Any -from collections import namedtuple +from typing import Any, NamedTuple from http.server import BaseHTTPRequestHandler from http.server import HTTPServer from urllib.parse import urlparse, parse_qs @@ -119,23 +118,28 @@ class TaskHandler(BaseHTTPRequestHandler): def do_GET_day(self) -> dict[str, object]: """Show single Day of ?date=.""" + + class ConditionListing(NamedTuple): + """Listing of Condition augmented with its enablers, disablers.""" + condition: Condition + enablers: list[Todo] + disablers: list[Todo] + date = self.params.get_str('date', todays_date()) top_todos = [t for t in Todo.by_date(self.conn, date) if not t.parents] seen_todos: set[int] = set() seen_conditions: set[int] = set() todo_trees = [t.get_step_tree(seen_todos, seen_conditions) for t in top_todos] - ConditionsNode = namedtuple('ConditionsNode', - ('condition', 'enablers', 'disablers')) - conditions_nodes: list[ConditionsNode] = [] - for condi in Condition.all(self.conn): - enablers = Todo.enablers_for_at(self.conn, condi, date) - disablers = Todo.disablers_for_at(self.conn, condi, date) - conditions_nodes += [ConditionsNode(condi, enablers, disablers)] + condition_listings: list[ConditionListing] = [] + for cond in Condition.all(self.conn): + enablers = Todo.enablers_for_at(self.conn, cond, date) + disablers = Todo.disablers_for_at(self.conn, cond, date) + condition_listings += [ConditionListing(cond, enablers, disablers)] return {'day': Day.by_id(self.conn, date, create=True), 'todo_trees': todo_trees, 'processes': Process.all(self.conn), - 'conditions_nodes': conditions_nodes} + 'condition_listings': condition_listings} def do_GET_todo(self) -> dict[str, object]: """Show single Todo of ?id=.""" diff --git a/templates/day.html b/templates/day.html index b38d566..e3fe5ef 100644 --- a/templates/day.html +++ b/templates/day.html @@ -29,7 +29,7 @@ add todo:

conditions

-{% for node in conditions_nodes %} +{% for node in condition_listings %}
  • [{% if node.condition.is_active %}x{% else %} {% endif %}] {{node.condition.title.newest|e}}