X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Ftimeworked.html;h=e810822d7af5bf3dc46480039bc2ed5b9f983b2f;hb=b6dbe0f12dbbe4ea5209367f905f937789b5b607;hp=49173bd08a1023d75fb002573e75f4ff264ab974;hpb=7043f97e59b35d497e3e4fc66e6f23dbee34ca53;p=freeside.git
diff --git a/httemplate/search/timeworked.html b/httemplate/search/timeworked.html
index 49173bd08..e810822d7 100644
--- a/httemplate/search/timeworked.html
+++ b/httemplate/search/timeworked.html
@@ -32,19 +32,7 @@
'',
'',
],
- 'html_foot' => sub {
- '
'.
- ''.
- '
'.
- '';
- },
+ 'html_foot' => $html_foot,
)
%>
@@ -57,12 +45,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,6 +78,7 @@ 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'
)
@@ -95,6 +86,13 @@ my $where = "
";
#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'),
@@ -113,4 +111,22 @@ my $count_query = "SELECT COUNT(*) FROM Transactions $where";
my $link = [ "${p}rt/Ticket/Display.html?id=", sub { shift->[0]; } ];
+my $html_foot = qq'
+
+
+
+
+
+
+
+
+';
+
%init>