Merge lp:~felmas/mvhub/call_manager_display into lp:mvhub

Proposed by Ferhat Elmas
Status: Merged
Merged at revision: 589
Proposed branch: lp:~felmas/mvhub/call_manager_display
Merge into: lp:mvhub
Diff against target: 116 lines (+31/-14)
3 files modified
app-mvhub/conf/templates/html/call_manager.tmpl (+20/-7)
lib-mvhub/lib/MVHub/CallManager.pm (+5/-2)
lib-mvhub/lib/MVHub/Notifications.pm (+6/-5)
To merge this branch: bzr merge lp:~felmas/mvhub/call_manager_display
Reviewer Review Type Date Requested Status
Dan MacNeil Approve
Review via email: mp+71434@code.launchpad.net

Description of the change

  Added last_updated date and reminders_sent data to the display of call manager.

To post a comment you must log in.
Revision history for this message
Dan MacNeil (omacneil) wrote :

Approve: (now you are in mvhub-commit , so you can merge to trunk)

Better in some way: (adds info)
Worse in no ways: (style good, tests pass)

possible Tweak:
  provide labels for new info:

option a
   move new info to new line <tr>
   add labels

> Only CHECKED Program names are updated
> Greyhound Pets of America-New Hampshire Chapter (Main Agency Record)
> last update: 2007-07-01 reminders sent: 4
>
> Greyhound Pets of America New Hampshire Chapter
> last update: 2007-07-01 reminders sent: 4

option b
   remove empty <td> so info lines up on left and there is more room for labels
   add labels

option c
> Only CHECKED Program names are updated
>Greyhound Pets of America-New Hampshire Chapter (Main Agency Record) last update: 2007-07-01 reminders sent: 4
>Greyhound Pets of America New Hampshire Chapter last update: 2007-07-01 reminders sent: 4

Let me know if you don't tweak so I can add another bug to get somebody else to do it.

review: Approve
Revision history for this message
Ferhat Elmas (felmas) wrote :

> Approve: (now you are in mvhub-commit , so you can merge to trunk)
>
> Better in some way: (adds info)
> Worse in no ways: (style good, tests pass)
>
> possible Tweak:
> provide labels for new info:
>
> option a
> move new info to new line <tr>
> add labels
>
> > Only CHECKED Program names are updated
> > Greyhound Pets of America-New Hampshire Chapter (Main Agency Record)
> > last update: 2007-07-01 reminders sent: 4
> >
> > Greyhound Pets of America New Hampshire Chapter
> > last update: 2007-07-01 reminders sent: 4
>
> option b
> remove empty <td> so info lines up on left and there is more room for
> labels
> add labels
>
> option c
> > Only CHECKED Program names are updated
> >Greyhound Pets of America-New Hampshire Chapter (Main Agency Record) last
> update: 2007-07-01 reminders sent: 4
> >Greyhound Pets of America New Hampshire Chapter last update: 2007-07-01
> reminders sent: 4
>
>
> Let me know if you don't tweak so I can add another bug to get somebody else
> to do it.

I chose option a because

option b: I think, blank line between agency data and checkboxes looks better for eyes
option c: For only one line, it is so large / wide.

591. By Ferhat Elmas <<email address hidden>>

provided labels for new info

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app-mvhub/conf/templates/html/call_manager.tmpl'
2--- app-mvhub/conf/templates/html/call_manager.tmpl 2011-03-31 16:11:21 +0000
3+++ app-mvhub/conf/templates/html/call_manager.tmpl 2011-08-14 23:49:23 +0000
4@@ -30,8 +30,6 @@
5
6 </td>
7 </tr>
8-
9-
10 <tr>
11 <td>
12 <input type="hidden"
13@@ -48,17 +46,32 @@
14 </tr>
15 <!--TMPL_LOOP NAME = 'CHECKBOX_LOOP_TAG' -->
16 <tr>
17- <td>
18-
19- </td>
20+ <td>
21+
22+ </td>
23 <td align="left">
24 <input type="checkbox"
25 name= "<!--TMPL_VAR NAME='checkbox_name' -->"
26 value="1"
27 checked="yes"
28 />
29- <!--TMPL_VAR NAME='record_name' -->
30- </td>
31+ <!--TMPL_VAR NAME='record_name' -->
32+ </td>
33+ </tr>
34+ <tr>
35+ <td>
36+
37+ </td>
38+ <td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
39+
40+ last update:
41+
42+ <!--TMPL_VAR NAME='last_updated' --> &nbsp;
43+
44+ reminders sent:
45+
46+ <!--TMPL_VAR NAME='reminders_sent' -->
47+ </td>
48 </tr>
49 <!--/TMPL_LOOP-->
50 <tr>
51
52=== modified file 'lib-mvhub/lib/MVHub/CallManager.pm'
53--- lib-mvhub/lib/MVHub/CallManager.pm 2011-03-31 16:14:16 +0000
54+++ lib-mvhub/lib/MVHub/CallManager.pm 2011-08-14 23:49:23 +0000
55@@ -1,4 +1,5 @@
56 package MVHub::CallManager;
57+
58 use strict;
59 use warnings;
60
61@@ -142,7 +143,7 @@
62 );
63
64 delete @$href{
65- qw/public_email reminders_sent quick_login_passwd agency_contact_email/
66+ qw/public_email reminders_sent last_updated quick_login_passwd agency_contact_email/
67 };
68
69 $$href{mailto} = _make_mailto_link( $href, $quick_login_url );
70@@ -176,7 +177,9 @@
71 my %checkbox;
72 $checkbox{checkbox_name}
73 = "$$p_href{record_id}_$$p_href{record_type}_checkbox";
74- $checkbox{record_name} = $$p_href{record_name};
75+ $checkbox{record_name} = $$p_href{record_name};
76+ $checkbox{last_updated} = $$p_href{last_updated};
77+ $checkbox{reminders_sent} = $$p_href{reminders_sent};
78 push @checkboxes, \%checkbox;
79 }
80
81
82=== modified file 'lib-mvhub/lib/MVHub/Notifications.pm'
83--- lib-mvhub/lib/MVHub/Notifications.pm 2011-03-31 16:16:55 +0000
84+++ lib-mvhub/lib/MVHub/Notifications.pm 2011-08-14 23:49:23 +0000
85@@ -12,8 +12,6 @@
86 use MVHub::Utils;
87 use MVHub::Utils::DB;
88
89-our ($VERSION) = '$Revision: 1334 $' =~ /([.\d]+)/;
90-
91 use base 'Exporter';
92 our @EXPORT_OK = qw(
93
94@@ -112,9 +110,11 @@
95
96 push @$programs_aref,
97 {
98- record_name => $record_href->{'record_name'},
99- record_type => $record_href->{'record_type'},
100- record_id => $record_href->{'record_id'},
101+ record_name => $record_href->{'record_name'},
102+ record_type => $record_href->{'record_type'},
103+ record_id => $record_href->{'record_id'},
104+ last_updated => $record_href->{'last_updated'},
105+ reminders_sent => $record_href->{'reminders_sent'},
106 };
107
108 return $programs_aref;
109@@ -197,6 +197,7 @@
110 $notifications_for{$unique_id}{reminders_sent}
111 = $expired_record_href->{'reminders_sent'};
112 }
113+
114 }
115
116 return %notifications_for;

Subscribers

People subscribed via source and target branches