Merge lp:~bryce/gtg/scheduling into lp:~gtg/gtg/old-trunk

[Bryce Harrington]

[Bryce Harrington (bryce)]

I'm already finding these changes quite useful, I think they're ready for review and to into trunk.

[Lionel Dricot (ploum-deactivatedaccount)]

Interesting but I fail to see the usefulness of "Start today". I think that this patch should come along with renaming "start date" to "defer to" or something similar

Traceback (most recent call last):
  File "/home/ploum/gtg/GTG/taskbrowser/tasktree.py", line 604, in scroll_to_task
    self.scroll_to_cell(model.get_path(iter),
TypeError: iter should be a GtkTreeIter

review: Needs Fixing

[Lionel Dricot (ploum-deactivatedaccount)]

Also, I think that bug #340022 should be solved before we can merge your patch and at a startdate column.

That startdate column should not be displayed in the workview.

[Lionel Dricot (ploum-deactivatedaccount)]

I would also prefer a single menu entry "Defer to…" with submenu for : tomorrow, next week, next month" so we can also have the same for the due date.

[Bryce Harrington (bryce)]

> Also, I think that bug #340022 should be solved before we can merge your patch and at a startdate column.

Why? Bug #340022 seems to have nothing in common with this except that it also thinks the Due date column should go away (but that is already covered by bug #497227.) The format for displaying things that #340022 suggests might be useful but I have no interest in implementing it myself. No one is working on #340022 afaik so predicating acceptance of this branch on solution of that bug just blocks me from being able to make this contribution, which is very discouraging to me.

> I think that this patch should come along with renaming "start date" to "defer to" or something similar

It is unclear what you mean by that.

> Interesting but I fail to see the usefulness of "Start today".

By default, no start date is set on tasks. If you want to indicate "I have started these tasks today" the only way to do it currently is to open each task individually and mark them such. This permits a simpler method for setting the start date to now for a range of tasks. This is helpful when you have a lot of tasks and are using start_date to help organize your tasks.

This functionality increases in importance with the defer to... functionality. The reason is because these functions make it easy to postpone tasks off into the future. For instance, I might write down 50 tasks for a project due in a few months, and then postpone the 20 tasks to next month. Now my 'Work View' is not cluttered with this future project. But then later I realize that 7 tasks need started sooner. I turn off 'Work View' so I can see the whole project, select the 7 tasks, and mark them 'Start Today'. Now those 4 tasks show up in my Work View.

[Lionel Dricot (ploum-deactivatedaccount)]

> Why?

I agree. But I said byg#34022, I was thinking about bug #497227 and did my search quickly without reading. I was thinking about the idea to put the due date above a certain threshold and the number of days below it so everything fits in one column.

My bad.

> It is unclear what you mean by that.

It's not required. It's just that we discussed about that change a while ago (there should be a bug about it) because it's better to have an "action" in a menu than a concept. I was thinking that your branch might be a good opportunity for such a change.

>> Start today

That's a good explanation, I'm sold ;-) Indeed, it's very important when you want to "undefer" a bunch of tasks.

Could we review this branch again ?

[Bryce Harrington (bryce)]

Some further comments from Bertrand:

>Bryce: Your implementation is nice. As for the wording, if the submenu
contains "today" as an option then I think "Schedule this task" would be
better ("Postpone to today" sounds weird). Their should be an option
below "Schedule this task" allowing to clear the satrt date as well,
that appears when (at least one) start date is defined in the selected
task(s).

[Bryce Harrington (bryce)]

Resubmitting for merge at Lionel's request.

[Bryce Harrington (bryce)]

> It's not required. It's just that we discussed about that change a while ago (there should be a bug about it) because it's better to have an "action" in a menu than a concept. I was thinking that your branch might be a good opportunity for such a change.

I can change that as well, but I'm not clear on where the menu is that this "Start Date" is being improperly shown in.

[Lionel Dricot (ploum-deactivatedaccount)]

Hello Bryce,

I've just read the code and it seems really nice.

I think it only needs some cleaning (see "<<<<<<< TREE" and stuffs like that in browser.py)

I personally believe it should go in 0.2.1, what do you think ?

review: Needs Fixing

[Bryce Harrington (bryce)]

Odd, not sure what that is, maybe it just needs re-merged against trunk?

review: Needs Resubmitting

[Bryce Harrington (bryce)]

Resubmitting after merge to trunk

review: Needs Resubmitting

[Lionel Dricot (ploum-deactivatedaccount)]

There's still some <<<<<<< TREE (see the diff below on this same page)

[Bryce Harrington (bryce)]

I'm confused by this - I don't see this in my own bzr tree. Where is that coming from, and how do I get rid of it?

[lp:~bryce/gtg/scheduling]

542. By Bryce Harrington on 2010-01-22

Merge with trunk

[Bryce Harrington (bryce)]

Should be straight now.

[Bertrand Rousseau (bertrand-rousseau)]

This is fine for me. Since trunk is supposed to be frozen for 0.2.1 release, I'd ask another developer to agree on merging this before actually doing it.

review: Approve

[lp:~bryce/gtg/scheduling]

543. By Bryce Harrington on 2010-01-25

Add some further scheduling targets.

544. By Bryce Harrington on 2010-01-25

Need to explicitly cast to int

[Bertrand Rousseau (bertrand-rousseau)]

I'd like to process this merge request, could another developer take some time to review it, please?

[Luca Invernizzi (invernizzi)]

Is fine for me.
Maybe, in the future, we could add support for FuzzyDates

review: Approve

[lp:~bryce/gtg/scheduling]

545. By Bryce Harrington on 2010-01-25

Get rid of warning for stray handler function

546. By Bryce Harrington on 2010-01-25

Try adding an accelerator for scheduling for tomorrow

547. By Bryce Harrington on 2010-01-25

Add accelerator keys for postponing tasks 1/2/3 days/weeks/months

=== modified file 'GTG/core/task.py'
--- GTG/core/task.py	2010-01-08 20:51:01 +0000
+++ GTG/core/task.py	2010-01-22 06:34:12 +0000
@@ -204,7 +204,7 @@
     def set_start_date(self, fulldate):
         assert(isinstance(fulldate, Date))
         self.start_date = fulldate
-        # why don't we sync here if we do in set_due_date?
+        self.sync()
 
     def get_start_date(self):
         return self.start_date
@@ -216,7 +216,11 @@
             #results in a datetime.timedelta object 
             #that does have a 'days' member.
             difference = date_today() - self.start_date
-            return difference.days >= 0 #pylint: disable-msg=E1101
+            if difference.days == 0:
+                # Don't count today's tasks started until morning
+                return datetime.now().hour > 4
+            else:
+                return difference.days > 0 #pylint: disable-msg=E1101
         else:
             return True
 

=== modified file 'GTG/taskbrowser/browser.py'
--- GTG/taskbrowser/browser.py	2010-01-19 17:37:24 +0000
+++ GTG/taskbrowser/browser.py	2010-01-22 06:34:12 +0000
@@ -233,6 +233,7 @@
         self.tagpopup           = self.builder.get_object("TagContextMenu")
         self.nonworkviewtag_checkbox     = self.builder.get_object("nonworkviewtag")
         self.taskpopup          = self.builder.get_object("TaskContextMenu")
+        self.defertopopup       = self.builder.get_object("DeferToContextMenu")
         self.ctaskpopup = \
             self.builder.get_object("ClosedTaskContextMenu")
         self.editbutton         = self.builder.get_object("edit_b")
@@ -313,6 +314,16 @@
                 self.on_add_new_tag,
             "on_mark_as_done":
                 self.on_mark_as_done,
+            "on_mark_as_started":
+                self.on_mark_as_started,
+            "on_schedule_for_tomorrow":
+                self.on_schedule_for_tomorrow,
+            "on_schedule_for_next_week":
+                self.on_schedule_for_next_week,
+            "on_schedule_for_next_month":
+                self.on_schedule_for_next_month,
+            "on_schedule_for_next_year":
+                self.on_schedule_for_next_year,
             "on_dismiss_task":
                 self.on_dismiss_task,
             "on_delete":
@@ -738,7 +749,8 @@
     def get_canonical_date(self, arg):
         """
         Transform "arg" in a valid yyyy-mm-dd date or return None.
-        "arg" can be a yyyy-mm-dd, yyyymmdd, mmdd, today or a weekday name.
+        "arg" can be a yyyy-mm-dd, yyyymmdd, mmdd, today, next week,
+        next month, next year, or a weekday name.
         """
         day_names_en = ["monday", "tuesday", "wednesday", "thursday",
                         "friday", "saturday", "sunday"]
@@ -754,19 +766,24 @@
                 year = datetime.date.today().year
                 date = "%i-%s-%s" % (year, arg[:2], arg[2:])
         elif arg.lower() == "today" or arg.lower() == _("today"):
-            today = datetime.date.today()
-            year = today.year
-            month = today.month
-            day = today.day
-            date = "%i-%i-%i" % (year, month, day)
+            t = datetime.date.today()
+            date = "%i-%i-%i" % (t.year, t.month, t.day)
         elif arg.lower() == "tomorrow" or\
           arg.lower() == _("tomorrow"):
-            today = datetime.date.today()
-            tomorrow = today + datetime.timedelta(days=1)
-            year = tomorrow.year
-            month = tomorrow.month
-            day = tomorrow.day
-            date = "%i-%i-%i" % (year, month, day)
+            t = datetime.date.today() + datetime.timedelta(days=1)
+            date = "%i-%i-%i" % (t.year, t.month, t.day)
+        elif arg.lower() == "next week" or\
+          arg.lower() == _("next week"):
+            t = datetime.date.today() + datetime.timedelta(days=7)
+            date = "%i-%i-%i" % (t.year, t.month, t.day)
+        elif arg.lower() == "next month" or\
+          arg.lower() == _("next month"):
+            t = datetime.date.today() + datetime.timedelta(days=30)
+            date = "%i-%i-%i" % (t.year, t.month, t.day)
+        elif arg.lower() == "next year" or\
+          arg.lower() == _("next year"):
+            t = datetime.date.today() + datetime.timedelta(days=365)
+            date = "%i-%i-%i" % (t.year, t.month, t.day)
         elif arg.lower() in day_names_en or arg.lower() in day_names:
             today = datetime.date.today()
             today_day = today.weekday()
@@ -1516,6 +1533,33 @@
         else:
             return False
     
+    def update_start_date(self, widget, new_start_date):
+        tasks_uid = filter(lambda uid: uid != None, self.get_selected_tasks())
+        if len(tasks_uid) == 0:
+            return
+        tasks = [self.req.get_task(uid) for uid in tasks_uid]
+        tasks_status = [task.get_status() for task in tasks]
+        for uid, task, status in zip(tasks_uid, tasks, tasks_status):
+            task.set_start_date(self.get_canonical_date(new_start_date))
+        if self.refresh_lock.acquire(False):
+            gobject.idle_add(self.general_refresh)
+        #FIXME: If the task dialog is displayed, refresh its start_date widget
+
+    def on_mark_as_started(self, widget):
+        self.update_start_date(widget, "today")
+
+    def on_schedule_for_tomorrow(self, widget):
+        self.update_start_date(widget, "tomorrow")
+
+    def on_schedule_for_next_week(self, widget):
+        self.update_start_date(widget, "next week")
+
+    def on_schedule_for_next_month(self, widget):
+        self.update_start_date(widget, "next month")
+
+    def on_schedule_for_next_year(self, widget):
+        self.update_start_date(widget, "next year")
+
     def on_add_new_tag(self, widget=None, tid=None, tryagain = False):
         if not tid:
             self.tids_to_addtag = self.get_selected_tasks()
@@ -1628,7 +1672,7 @@
             gobject.idle_add(self.ctask_tv.scroll_to_task, task_to_scroll_to)
         if self.refresh_lock.acquire(False):
             gobject.idle_add(self.general_refresh)
-    
+
     def on_select_tag(self, widget, row=None, col=None):
         #When you clic on a tag, you want to unselect the tasks
         self.task_tv.get_selection().unselect_all()

=== modified file 'GTG/taskbrowser/taskbrowser.glade'
--- GTG/taskbrowser/taskbrowser.glade	2010-01-17 23:07:20 +0000
+++ GTG/taskbrowser/taskbrowser.glade	2010-01-22 06:34:12 +0000
@@ -863,6 +863,16 @@
       </object>
     </child>
     <child>
+      <object class="GtkImageMenuItem" id="tcm_schedule_menu">
+        <property name="label" translatable="yes">_Schedule for...</property>
+        <property name="visible">True</property>
+        <property name="submenu">ScheduleForContextMenu</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_schedule_for_menu"/>
+      </object>
+    </child>
+    <child>
       <object class="GtkImageMenuItem" id="tcm_mark_as_done">
         <property name="label" translatable="yes">Mark as _Done</property>
         <property name="visible">True</property>
@@ -909,6 +919,54 @@
       </object>
     </child>
   </object>
+  <object class="GtkMenu" id="ScheduleForContextMenu">
+    <property name="visible">True</property>
+    <child>
+      <object class="GtkImageMenuItem" id="tcm_mark_as_started">
+        <property name="label" translatable="yes">t_oday</property>
+        <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_mark_as_started"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="tcm_schedule_for_tomorrow">
+        <property name="label" translatable="yes">_tomorrow</property>
+        <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_schedule_for_tomorrow"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="tcm_schedule_for_next_week">
+        <property name="label" translatable="yes">next _week</property>
+        <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_schedule_for_next_week"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="tcm_schedule_for_next_month">
+        <property name="label" translatable="yes">next _month</property>
+        <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_schedule_for_next_month"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="tcm_schedule_for_next_year">
+        <property name="label" translatable="yes">next _year</property>
+        <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_schedule_for_next_year"/>
+      </object>
+    </child>
+  </object>
   <object class="GtkMenu" id="ClosedTaskContextMenu">
     <property name="visible">True</property>
     <child>

=== modified file 'GTG/taskbrowser/tasktree.py'
--- GTG/taskbrowser/tasktree.py	2009-12-21 00:05:04 +0000
+++ GTG/taskbrowser/tasktree.py	2010-01-22 06:34:12 +0000
@@ -37,6 +37,7 @@
 COL_DLEFT     = 6
 COL_TAGS      = 7
 COL_LABEL     = 9
+COL_SDATE     = 10
 
 class TaskTreeModel(gtk.GenericTreeModel):
 
@@ -50,6 +51,7 @@
         str,\
         gobject.TYPE_PYOBJECT,\
         str,\
+        str,\
         str)
 
     def __init__(self, requester):
@@ -110,6 +112,8 @@
             return task
         elif column == COL_TITLE:
             return saxutils.escape(task.get_title())
+        elif column == COL_SDATE:
+            return str(task.get_start_date())
         elif column == COL_DDATE:
             return str(task.get_due_date())
         elif column == COL_CDATE:
@@ -414,6 +418,18 @@
         self.append_column(title_col)
         self.columns.insert(COL_TITLE, title_col)
 
+        # Start date column
+        sdate_col   = gtk.TreeViewColumn()
+        render_text = gtk.CellRendererText()
+        sdate_col.set_title(_("Start date"))
+        sdate_col.pack_start(render_text, expand=False)
+        sdate_col.add_attribute(render_text, "markup", COL_SDATE)
+        sdate_col.set_resizable(False)
+        sdate_col.set_sort_column_id(COL_SDATE)
+        sdate_col.set_cell_data_func(render_text, self._celldatafunction)
+        self.append_column(sdate_col)
+        self.columns.insert(COL_SDATE, sdate_col)
+
         # Due date column
         ddate_col   = gtk.TreeViewColumn()
         render_text = gtk.CellRendererText()
@@ -427,16 +443,16 @@
         self.columns.insert(COL_DDATE, ddate_col)
 
         # days left
-        dleft_col   = gtk.TreeViewColumn()
-        render_text = gtk.CellRendererText()
-        dleft_col.set_title(_("Days left"))
-        dleft_col.pack_start(render_text, expand=False)
-        dleft_col.add_attribute(render_text, "markup", COL_DLEFT)
-        dleft_col.set_resizable(False)
-        dleft_col.set_sort_column_id(COL_DLEFT)
-        dleft_col.set_cell_data_func(render_text, self._celldatafunction)
-        self.append_column(dleft_col)
-        self.columns.insert(COL_DLEFT, dleft_col)
+#        dleft_col   = gtk.TreeViewColumn()
+#        render_text = gtk.CellRendererText()
+#        dleft_col.set_title(_("Days left"))
+#        dleft_col.pack_start(render_text, expand=False)
+#        dleft_col.add_attribute(render_text, "markup", COL_DLEFT)
+#        dleft_col.set_resizable(False)
+#        dleft_col.set_sort_column_id(COL_DLEFT)
+#        dleft_col.set_cell_data_func(render_text, self._celldatafunction)
+#        self.append_column(dleft_col)
+#        self.columns.insert(COL_DLEFT, dleft_col)
 
         # Global treeview properties
         self.set_property("expander-column", title_col)