X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Ftimeworked.html;h=bbfd0334d2e1bc4fc29a99e15ff0d5900b73d19e;hb=f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7;hp=b72dd0ea998040f31654e57947177f740763ee37;hpb=1591e861f33cd2920e6af6fb118c173f6806be76;p=freeside.git
diff --git a/httemplate/search/timeworked.html b/httemplate/search/timeworked.html
index b72dd0ea9..bbfd0334d 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,14 +78,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 +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'
+
+
+
+
+
+
+
+
+';
+
%init>