Merge lp:~gmb/launchpad/add-next_check-to-bugwatch-pages-bug-558410 into lp:launchpad

[Graham Binns]

Display the lastchecked and next_check values for BugWatches on the BugTracker overview and BugWatch +edit pages.

This branch changes the BugTracker overview and BugWatch +edit pages so
that they now display a watch's next_check and lastchecked columns. This
will give users a better idea of when to expect a bug watch to be
updated.

== lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt ==

 - I've added tests to cover the new "Last checked" and "Next check"
   columns.

== lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt ==

 - I've added tests to cover the new "Last checked" and "Scheduled"
   items on the page.

== lib/lp/bugs/templates/bugtracker-portlet-watches.pt ==

 - The lastchecked and next_check fields of each BugWatch are now
   displayed in the BugWatch table.

== lib/lp/bugs/templates/bugwatch-portlet-details.pt ==

 - The lastchecked and next_check fields of each BugWatch are now
   displayed on the +edit page.

[Abel Deuring (adeuring)]

review: Approve (code)

[Michael Nelson (michael.nelson)]

Looks great Graham. I noticed you are using approximatedate for the 'Last checked' column, which I think is correct, as seeing 3 days ago would be more helpful to me than 2010-04-06, but it seems that approximatedate only does so if the timedelta is <= 1 day... do you know why this is?

Also why not simply use 'Last check' as the column heading? (ie. a noun, like 'Next check' and the other column headers).

Very insignificant thought regarding the ordering of the 2 col dls, would it be easier to scan if Created/Changed and Checked/Scheduled where vertically aligned like this:

Tracker | Remote bug id
Last status | Created
Checked | Changed
Scheduled | Created by

Anyway, approved either way.

review: Approve (ui)

[Graham Binns (gmb)]

On Fri, Apr 09, 2010 at 10:52:38AM -0000, Michael Nelson wrote:
> Review: Approve ui
> Looks great Graham. I noticed you are using approximatedate for the
> 'Last checked' column, which I think is correct, as seeing 3 days ago
> would be more helpful to me than 2010-04-06, but it seems that
> approximatedate only does so if the timedelta is <= 1 day... do you
> know why this is?

I don't know. Long forgotten design decision probably.

>
> Also why not simply use 'Last check' as the column heading? (ie. a
> noun, like 'Next check' and the other column headers).

No reason; I'll change it.

> Very insignificant thought regarding the ordering of the 2 col dls,
> would it be easier to scan if Created/Changed and Checked/Scheduled
> where vertically aligned like this:

True. I'll see if I can fix that in my next branch, which is going to
work on that page anyway.

> Tracker | Remote bug id
> Last status | Created
> Checked | Changed
> Scheduled | Created by
>
> Anyway, approved either way.

Thanks.

--
Graham Binns | PGP Key: EC66FA7D

=== modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt'
--- lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt	2010-04-09 12:15:52 +0000
@@ -537,16 +537,38 @@
 When looking at a bug tracker page, a list of bug watches is
 displayed:
 
-  >>> anon_browser.open(
-  ...     'http://launchpad.dev/bugs/bugtrackers/debbugs')
-  >>> print extract_text(find_tag_by_id(
-  ...     anon_browser.contents, 'latestwatches'))
-  Launchpad bug                      Remote bug  Status
-  #15: Nonsensical bugs are useless  308994      open important
-  #3:  Bug Title Test                327549
-  #2:  Blackhole Trash folder        327452
-  #1:  Firefox does not support SVG  304014
-  #7:  A test bug                    280883
+    >>> anon_browser.open(
+    ...     'http://launchpad.dev/bugs/bugtrackers/debbugs')
+    >>> print extract_text(find_tag_by_id(
+    ...     anon_browser.contents, 'latestwatches'))
+    Launchpad bug  Remote bug  Status  Last check  Next check
+    #15: Nonse...  308994      open...
+    #3:  Bug T...  327549
+    #2:  Black...  327452
+    #1:  Firef...  304014
+    #7:  A tes...  280883
+
+Scheduling any of the watches will change their "Next check" column.
+
+    >>> from datetime import datetime
+    >>> from pytz import utc
+
+    >>> login('[e-mail]')
+    >>> debbugs = getUtility(IBugTrackerSet).getByName('debbugs')
+    >>> watch_15 = debbugs.watches[0]
+    >>> watch_15.next_check = datetime(2010, 4, 9, 9, 50, 0, tzinfo=utc)
+    >>> logout()
+
+    >>> anon_browser.open(
+    ...     'http://launchpad.dev/bugs/bugtrackers/debbugs')
+    >>> print extract_text(find_tag_by_id(
+    ...     anon_browser.contents, 'latestwatches'))
+    Launchpad bug  Remote bug  Status  Last check  Next check
+    #15: Nonse...  308994      open... 2007-12-18    2010-04-09 09:50:00 UTC
+    #3:  Bug T...  327549
+    #2:  Black...  327452
+    #1:  Firef...  304014
+    #7:  A tes...  280883
 
 
 === Private bugs ===
@@ -565,7 +587,7 @@
   ...     'http://launchpad.dev/bugs/bugtrackers/debbugs')
   >>> print extract_text(find_tag_by_id(
   ...     anon_browser.contents, 'latestwatches'))
-  Launchpad bug                      Remote bug  Status
+  Launchpad bug                      Remote bug  Status...
   #15: (Private)                     -
   #3:  Bug Title Test                327549
   #2:  Blackhole Trash folder        327452
@@ -615,7 +637,8 @@
   ...     watches = find_tag_by_id(
   ...         browser.contents, 'latestwatches').tbody.findAll('tr')
   ...     for watch in watches:
-  ...         bug, remote_bug, status = watch.findAll('td')
+  ...         bug, remote_bug, status, last_checked, next_check = (
+  ...             watch.findAll('td'))
   ...         print extract_text(bug)
   ...         print '  --> %s: %s' % (
   ...             extract_text(remote_bug),

=== modified file 'lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt'
--- lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt	2010-04-09 12:15:52 +0000
@@ -1,4 +1,6 @@
-= Edit a bug watch =
+Edit a bug watch
+================
+
 
 After a bug watch is recorded, it is possible to go back and change it.
 
@@ -36,3 +38,42 @@
     ...     print extract_text(message)
     There is 1 error.
     "GELLER" is not a valid URI
+
+
+BugWatch details
+----------------
+
+The +edit page for a watch also displays some details about the watch.
+
+    >>> for data_tag in find_tags_by_class(
+    ...     admin_browser.contents, 'bugwatch-data'):
+    ...     print extract_text(data_tag.renderContents())
+    Tracker: The Mozilla.org Bug Tracker
+    Remote bug ID: 1000
+    Last status: None recorded
+    Changed: 2004-10-04
+    Checked: 2004-10-04
+    Next check: Not yet scheduled
+    Created: 2004-10-04
+    Created by: Mark Shuttleworth
+
+If we change the next_check date of the watch its will be shown in the
+Next check column.
+
+    >>> from datetime import datetime
+    >>> from pytz import utc
+    >>> from zope.component import getUtility
+
+    >>> from canonical.launchpad.ftests import login, logout
+    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
+
+    >>> login('[e-mail]')
+    >>> watch = getUtility(IBugWatchSet).get(2)
+    >>> watch.next_check = datetime(2010, 4, 8, 16, 07, tzinfo=utc)
+    >>> logout()
+
+    >>> admin_browser.open('http://bugs.launchpad.dev/bugs/1/+watch/2')
+    >>> data_tag = find_tag_by_id(
+    ...     admin_browser.contents, 'bugwatch-next_check')
+    >>> print extract_text(data_tag.renderContents())
+    Next check: 2010-04-08...

=== modified file 'lib/lp/bugs/templates/bugtracker-portlet-watches.pt'
--- lib/lp/bugs/templates/bugtracker-portlet-watches.pt	2009-09-01 15:34:12 +0000
+++ lib/lp/bugs/templates/bugtracker-portlet-watches.pt	2010-04-09 12:15:52 +0000
@@ -13,6 +13,8 @@
           <th>Launchpad bug</th>
           <th>Remote bug</th>
           <th>Status</th>
+          <th>Last check</th>
+          <th>Next check</th>
         </tr>
       </thead>
       <tbody>
@@ -43,6 +45,18 @@
                 </a>
               </td>
               <td><tal:status tal:replace="watch/remotestatus"/></td>
+              <td>
+                <span
+                  tal:attributes="title watch/lastchecked/fmt:datetime"
+                  tal:content="watch/lastchecked/fmt:approximatedate">
+                  13 Jan 2004
+                 </span>
+              </td>
+              <td>
+                <span tal:content="watch/next_check/fmt:datetime">
+                  13 Jan 2004
+                 </span>
+              </td>
             </tal:show-watch-details>
           </tr>
         </tal:watches>

=== modified file 'lib/lp/bugs/templates/bugwatch-portlet-details.pt'
--- lib/lp/bugs/templates/bugwatch-portlet-details.pt	2009-09-03 15:47:41 +0000
+++ lib/lp/bugs/templates/bugwatch-portlet-details.pt	2010-04-09 12:15:52 +0000
@@ -5,13 +5,13 @@
   class="portlet">
   <h2>Bug watch details</h2>
     <div class="two-column-list">
-      <dl>
+      <dl class="bugwatch-data">
         <dt>Tracker:</dt>
         <dd>
           <a tal:replace="structure context/bugtracker/fmt:link"/>
         </dd>
       </dl>
-      <dl>
+      <dl class="bugwatch-data">
         <dt>Remote bug ID:</dt>
         <dd>
           <a tal:attributes="href context/url">
@@ -19,7 +19,7 @@
           </a>
         </dd>
       </dl>
-      <dl>
+      <dl class="bugwatch-data">
         <dt>Last status:</dt>
         <dd>
           <span tal:condition="not: context/remotestatus">
@@ -28,7 +28,7 @@
           <span tal:replace="context/remotestatus">6642</span>
         </dd>
       </dl>
-      <dl>
+      <dl class="bugwatch-data">
         <dt>Changed:</dt>
         <dd>
           <span
@@ -38,7 +38,7 @@
            </span>
         </dd>
       </dl>
-      <dl>
+      <dl class="bugwatch-data">
         <dt>Checked:</dt>
         <dd>
           <span
@@ -48,7 +48,21 @@
            </span>
         </dd>
       </dl>
-      <dl>
+      <dl class="bugwatch-data" id="bugwatch-next_check">
+        <dt>Next check:</dt>
+        <dd>
+          <span
+            tal:condition="context/next_check"
+            tal:content="context/next_check/fmt:datetime">
+            13 Jan 2004
+           </span>
+          <span
+            tal:condition="not: context/next_check">
+            Not yet scheduled
+           </span>
+        </dd>
+      </dl>
+      <dl class="bugwatch-data">
         <dt>Created:</dt>
         <dd>
           <span
@@ -58,7 +72,7 @@
            </span>
         </dd>
       </dl>
-      <dl>
+      <dl class="bugwatch-data">
         <dt>Created by:</dt>
         <dd>
           <a tal:replace="structure context/owner/fmt:link" />