X-Git-Url: https://plomlompom.com/repos/todo?a=blobdiff_plain;f=plomtask%2Fhttp.py;h=91db32601c24c91c49db75df4f9ca2b05fd9b944;hb=5ced0155ad11f5fb87aaa0848402e95f8ff49acd;hp=3d507be9b344ff8be7ca26952bfa422872ec6b78;hpb=47214d1d93d988deb3d0fc828f7fd35075e6d073;p=plomtask diff --git a/plomtask/http.py b/plomtask/http.py index 3d507be..91db326 100644 --- a/plomtask/http.py +++ b/plomtask/http.py @@ -191,8 +191,6 @@ class TaskHandler(BaseHTTPRequestHandler): ret = Day.by_date_range_with_limits(self.conn, (start, end), 'id') days, start, end = ret days = Day.with_filled_gaps(days, start, end) - for day in days: - day.collect_calendarized_todos(self.conn) today = date_in_n_days(0) return {'start': start, 'end': end, 'days': days, 'today': today} @@ -209,9 +207,6 @@ class TaskHandler(BaseHTTPRequestHandler): date = self._params.get_str('date', date_in_n_days(0)) make_type = self._params.get_str('make_type') todays_todos = Todo.by_date(self.conn, date) - total_effort = 0.0 - for todo in todays_todos: - total_effort += todo.performed_effort conditions_present = [] enablers_for = {} disablers_for = {} @@ -229,7 +224,7 @@ class TaskHandler(BaseHTTPRequestHandler): top_nodes = [t.get_step_tree(seen_todos) for t in todays_todos if not t.parents] return {'day': Day.by_id(self.conn, date, create=True), - 'total_effort': total_effort, + 'total_effort': Todo.total_effort_at_date(self.conn, date), 'top_nodes': top_nodes, 'make_type': make_type, 'enablers_for': enablers_for,