timeworked report: carry the date range through to the success redirect

diff --git a/httemplate/misc/process/timeworked.html b/httemplate/misc/process/timeworked.html
index 860118e..200a751 100644 (file)
--- a/httemplate/misc/process/timeworked.html
+++ b/httemplate/misc/process/timeworked.html
@@ -1,13 +1,15 @@
 % if ($error) {
 <% $cgi->redirect(popurl(2). "timeworked.html?". $cgi->query_string) %>
 % } else {
-<% $cgi->redirect(popurl(3). "search/timeworked.html") %>
+<% $cgi->redirect(popurl(3). "search/timeworked.html?begin=$begin;end=$end") %>
 % }
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Time queue');
 
+my($begin, $end) = FS::UI::Web::parse_beginning_ending($cgi);
+
 my @acct_rt_transaction;
 foreach my $transaction (
   map { /^transactionid(\d+)$/; $1; } grep /^transactionid\d+$/, $cgi->param

diff --git a/httemplate/misc/timeworked.html b/httemplate/misc/timeworked.html
index db4b64c..46063e8 100755 (executable)
--- a/httemplate/misc/timeworked.html
+++ b/httemplate/misc/timeworked.html
@@ -92,6 +92,9 @@
 
 <BR>
 
+<INPUT TYPE="hidden" NAME="begin" VALUE="<% $cgi->param('begin') |h %>">
+<INPUT TYPE="hidden" NAME="end"   VALUE="<% $cgi->param('end')   |h %>">
+
 <INPUT TYPE="submit" NAME="submit" VALUE="<% $title %>">
 </FORM>
 

diff --git a/httemplate/search/timeworked.html b/httemplate/search/timeworked.html
index 29f9b25..1d877e6 100644 (file)
--- a/httemplate/search/timeworked.html
+++ b/httemplate/search/timeworked.html
@@ -32,19 +32,7 @@
                    '',
                    '',
                  ],
-                 'html_foot' => sub {
-                                  '<BR><INPUT TYPE="button" VALUE="select all" onClick="setAll(true)">'.
-                                  '<INPUT TYPE="button" VALUE="unselect all" onClick="setAll(false)">'.
-                                  '<BR><INPUT TYPE="submit" NAME="action" VALUE="Assign to accounts"><BR>'.
-                                  '<SCRIPT TYPE="text/javascript">'.
-                                  '  function setAll(setTo) { '.
-                                  '    theForm = document.timeForm;'.
-                                  '    for (i=0,n=theForm.elements.length;i<n;i++)'.
-                                  '      if (theForm.elements[i].name.indexOf("transactionid") != -1)'.
-                                  '        theForm.elements[i].checked = setTo;'.
-                                  '  }'.
-                                  '</SCRIPT>';
-                                },
+                 'html_foot' => $html_foot,
              )
 
 %>
@@ -99,9 +87,9 @@ my $where = "
 my $str2time_sql = str2time_sql;
 my $closing      = str2time_sql_closing;
 
-my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-$where .= " AND $str2time_sql Transactions.Created $closing >= $beginning ".
-          " AND $str2time_sql Transactions.Created $closing <= $ending";
+my($begin, $end) = FS::UI::Web::parse_beginning_ending($cgi);
+$where .= " AND $str2time_sql Transactions.Created $closing >= $begin ".
+          " AND $str2time_sql Transactions.Created $closing <= $end ";
 
 my $query = "
   SELECT Tickets.id, Tickets.Subject,
@@ -121,4 +109,22 @@ my $count_query = "SELECT COUNT(*) FROM Transactions $where";
 
 my $link = [ "${p}rt/Ticket/Display.html?id=", sub { shift->[0]; } ];
 
+my $html_foot = qq'
+  <INPUT TYPE="hidden" NAME="begin" VALUE="$begin">
+  <INPUT TYPE="hidden" NAME="end"   VALUE="$end">
+  <BR>
+  <INPUT TYPE="button" VALUE="select all" onClick="setAll(true)">
+  <INPUT TYPE="button" VALUE="unselect all" onClick="setAll(false)">
+  <BR>
+  <INPUT TYPE="submit" NAME="action" VALUE="Assign to accounts"><BR>
+  <SCRIPT TYPE="text/javascript">
+    function setAll(setTo) {
+      theForm = document.timeForm;
+      for (i=0,n=theForm.elements.length;i<n;i++)
+        if (theForm.elements[i].name.indexOf("transactionid") != -1)
+          theForm.elements[i].checked = setTo;
+    }
+  </SCRIPT>
+';
+
 </%init>