Fix inability of updating Todo if .is_done but no more doable.

[plomtask] / plomtask / http.py

diff --git a/plomtask/http.py b/plomtask/http.py
index cf8a8290ab35046124fc1db6f42418af7b42aea0..44c710b3b9bd46e04f67a210d6c3e526b0d43724 100644 (file)
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -123,7 +123,7 @@ class TaskHandler(BaseHTTPRequestHandler):
         start = self.params.get_str('start')
         end = self.params.get_str('end')
         if not end:
-            end = date_in_n_days(60)
+            end = date_in_n_days(366)
         ret = Day.by_date_range_with_limits(self.conn, (start, end), 'id')
         days, start, end = ret
         days = Day.with_filled_gaps(days, start, end)
@@ -144,6 +144,9 @@ class TaskHandler(BaseHTTPRequestHandler):
         """Show single Day of ?date=."""
         date = self.params.get_str('date', date_in_n_days(0))
         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 = {}
@@ -161,6 +164,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,
                 'top_nodes': top_nodes,
                 'enablers_for': enablers_for,
                 'disablers_for': disablers_for,
@@ -385,7 +389,8 @@ class TaskHandler(BaseHTTPRequestHandler):
         todo.set_blockers(self.conn, self.form_data.get_all_int('blocker'))
         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
+        if len(self.form_data.get_all_str('done')) > 0 != todo.is_done:
+            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)