X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Ftimeworked.html;h=fa4b895397d3127d06709a275d4132eb11a75e19;hb=7c370a4579d1ed8b81dba2fb5fae9978b283b49e;hp=b72dd0ea998040f31654e57947177f740763ee37;hpb=1591e861f33cd2920e6af6fb118c173f6806be76;p=freeside.git

diff --git a/httemplate/search/timeworked.html b/httemplate/search/timeworked.html
index b72dd0ea9..fa4b89539 100644
--- a/httemplate/search/timeworked.html
+++ b/httemplate/search/timeworked.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
                  'title'       => 'Time Worked',
                  'name'        => 'time',
 		 'html_form'   => qq!<FORM NAME="timeForm" ACTION="${p}misc/timeworked.html" METHOD="POST">!,
@@ -32,22 +32,9 @@
                    '',
                    '',
                  ],
-                 '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,
+             
+&>
 <%init>
 
 die "access denied"
@@ -57,12 +44,14 @@ my @groupby = ();
 
 my $transactiontime = "
   CASE Transactions.Type WHEN 'Set'
-    THEN (TO_NUMBER(NewValue,'999999')-TO_NUMBER(OldValue, '999999')) * 60
+    THEN (  CASE WHEN NewValue = '' THEN 0 ELSE TO_NUMBER(NewValue,'999999') END
+           -TO_NUMBER(OldValue, '999999')
+          ) * 60
     ELSE TimeTaken*60
   END
 ";
 
-push @groupby, qw( transactions.type newvalue oldvalue timetaken );
+push @groupby, qw( Transactions.Type NewValue OldValue TimeTaken );
 
 my $appliedtimeclause = "COALESCE (SUM(acct_rt_transaction.seconds), 0)";
 
@@ -88,14 +77,19 @@ my $groupby = join(',', @groupby);
 my $where = "
   WHERE ObjectType='RT::Ticket'
     AND ( ( Transactions.Type='Set' AND Field='TimeWorked' )
-          OR Transactions.Type='Create'
-          OR Transactions.Type='Comment'
-          OR Transactions.Type='Correspond'
+          OR Transactions.Type IN ( 'Create', 'Comment', 'Correspond', 'Touch' )
         )
     AND $wheretimeleft
 ";
     #AND $wheretimeleft
 
+my $str2time_sql = str2time_sql;
+my $closing      = str2time_sql_closing;
+
+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,
          TO_CHAR(Transactions.Created, 'Dy Mon DD HH24:MI:SS YYYY'),
@@ -114,4 +108,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>