From b27ccc7508a047aeff42a093cce8521be843e787 Mon Sep 17 00:00:00 2001
From: Christian Loos <cloos@netcologne.de>
Date: Thu, 16 Dec 2010 14:46:15 +0100
Subject: [PATCH 4/7] create ShowReminders element and use it in MyReminders

---
 share/html/Elements/MyReminders   |   31 +-----------
 share/html/Elements/ShowReminders |  101 +++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 30 deletions(-)
 create mode 100644 share/html/Elements/ShowReminders

diff --git a/share/html/Elements/MyReminders b/share/html/Elements/MyReminders
index 00ab113..8b20fbe 100755
--- a/share/html/Elements/MyReminders
+++ b/share/html/Elements/MyReminders
@@ -49,40 +49,11 @@
 <&|/Widgets/TitleBox,
     class => 'reminders',
     title => loc("Reminders") &>
-<table width="100%" class="reminders">
-<%perl>
-my $i =0;
-while (my $reminder = $reminders->Next) {
-$i++;
-my $targets = RT::Tickets->new($session{'CurrentUser'});
-$targets->FromSQL("ReferredToBy = ".$reminder->id);
 
-if (my $ticket= $targets->First) {
+<& /Elements/ShowReminders, OnlyOverdue => 1 &>
 
-</%perl>
-<tr class="<%$i%2 ? 'evenline' : 'oddline'%>">
-<td><a href="<%RT->Config->Get('WebPath')%>/Ticket/Display.html?id=<%$ticket->id%>"><%$reminder->Subject%></a><br />
-<span>
-#<%$ticket->id%>: <%$ticket->Subject%><br />
-<& /Elements/ShowUser, User => $reminder->OwnerObj &>
-<%$reminder->DueObj->Unix >0 ? '&bull; '.$reminder->DueObj->AgeAsString : '' |n %>
-</span>
-</td>
-</tr>
-% }
-% else {
-    <div class="error"><div class="error">
-<&|/l, $reminder->id &>Couldn't find a ticket for reminder [_1].</&><br/>
-<&|/l&>Please contact your administrator.</&>
-    </div></div>
-% }}
-</table>
 </&>
 
 <%init>
 return unless RT->Config->Get('EnableReminders');
-my $reminders = RT::Tickets->new($session{'CurrentUser'});
-$reminders->FromSQL('(Owner = "Nobody" OR Owner = "'.$session{'CurrentUser'}->id.'")' .
-    ' AND Type = "reminder" AND (Status = "new" OR Status = "open")'); 
-$reminders->OrderBy(FIELD => 'Due', ORDER => 'ASC');
 </%init>
diff --git a/share/html/Elements/ShowReminders b/share/html/Elements/ShowReminders
new file mode 100644
index 0000000..51c1614
--- /dev/null
+++ b/share/html/Elements/ShowReminders
@@ -0,0 +1,101 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%#
+%# COPYRIGHT:
+%#
+%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
+%# <jesse@bestpractical.com>
+%#
+%# (Except where explicitly superseded by other copyright notices)
+%#
+%#
+%# LICENSE:
+%#
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%#
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+%# General Public License for more details.
+%#
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%#
+%#
+%# CONTRIBUTION SUBMISSION POLICY:
+%#
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%#
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%#
+%# END BPS TAGGED BLOCK }}}
+% if ( $reminders->Count ) {
+<table border="0" cellpadding="1" cellspacing="0" width="100%" class="collection-as-table">
+<tr>
+<th class="collection-as-table"><&|/l&>Reminder</&></th>
+<th class="collection-as-table"><&|/l&>Due</&></th>
+<th class="collection-as-table"><&|/l&>Ticket</&></th>
+</tr>
+<%PERL>
+my $i =0;
+while ( my $reminder = $reminders->Next ) {
+$i++;
+my $dueobj = $reminder->DueObj;
+my $overdue = $dueobj->Unix > 0 && $dueobj->Diff < 0 ? 1 : 0;
+
+my $targets = RT::Tickets->new($session{'CurrentUser'});
+$targets->FromSQL( "ReferredToBy = " . $reminder->id );
+
+if ( my $ticket= $targets->First ) {
+</%PERL>
+<tr class="<% $i%2 ? 'oddline' : 'evenline' %>">
+<td class="collection-as-table">
+<a href="<% RT->Config->Get('WebPath') %>/Ticket/Reminders.html?id=<% $ticket->id %>"><% $reminder->Subject %></a>
+</td>
+<td class="collection-as-table">
+<% $overdue ? '<span class="overdue">' : '' |n %><% $dueobj->AgeAsString || loc('Not set') %><% $overdue ? '</span>' : '' |n %>
+</td>
+<td class="collection-as-table">
+<a href="<% RT->Config->Get( 'WebPath' ) %>/Ticket/Display.html?id=<% $ticket->id %>">#<% $ticket->Id %>: <% $ticket->Subject %></a>
+</td>
+% } else {
+<td colspan="3" class="collection-as-table>
+<div class="error"><div class="error">Couldn't find Ticket for reminder <% $reminder->id %>. Please contact administrator.</div></div>
+</td>
+% }
+</tr>
+% }
+</table>
+% }
+
+<%INIT>
+my $reminders = RT::Tickets->new($session{'CurrentUser'});
+my $tsql = 'Type = "reminder"' .
+           ' AND ( Owner = "Nobody" OR Owner ="' . $session{'CurrentUser'}->id . '")' .
+           ' AND ( Status = "new" OR Status = "open" )';
+
+$tsql .= ' AND Due < "now"' if $OnlyOverdue;
+
+$reminders->FromSQL($tsql);
+$reminders->OrderBy( FIELD => 'Due', ORDER => 'ASC' );
+</%INIT>
+
+<%ARGS>
+$OnlyOverdue => 0
+</%ARGS>
-- 
1.7.1