-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Time Worked',
- 'menubar' => [ 'Main menu' => $p, ],
'name' => 'time',
- 'html_form' => qq!<FORM NAME="timeForm" ACTION="${p}misc/timeworked.html" METHOD="POST">!,
+ 'html_form' => $html_form,
'query' => $query,
'count_query' => $count_query,
'header' => [ '#',
'', # checkbox column
],
'fields' => [ sub { shift->[0] },
- sub { shift->[1] },
+ sub { encode_entities(shift->[1]) },
sub { shift->[2] },
sub { my $seconds = shift->[3];
(($seconds < 0) ? '-' : '') .
qq!<INPUT NAME="seconds$id" TYPE="hidden" VALUE="$seconds">!;
},
],
- '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>';
- },
- )
-
-%>
+ 'links' => [
+ $link,
+ $link,
+ '',
+ '',
+ '',
+ ],
+ 'html_foot' => $html_foot,
+
+&>
<%init>
die "access denied"
my @groupby = ();
-my $transactiontime = "CASE transactions.type when 'Set' THEN (to_number(newvalue,'999999')-to_number(oldvalue, '999999')) * 60 ELSE timetaken*60 END";
-push @groupby, "transactions.type";
-push @groupby, "newvalue";
-push @groupby, "oldvalue";
-push @groupby, "timetaken";
+my $transactiontime = "
+ CASE Transactions.Type WHEN 'Set'
+ THEN ( CASE WHEN NewValue = '' THEN 0 ELSE TO_NUMBER(NewValue,'999999') END
+ -TO_NUMBER(OldValue, '999999')
+ ) * 60
+ ELSE TimeTaken*60
+ END
+";
-my $appliedtimeclause = "coalesce (sum(acct_rt_transaction.seconds), 0)";
+push @groupby, qw( Transactions.Type NewValue OldValue TimeTaken );
-my $appliedtimeselect = "SELECT sum(seconds) FROM acct_rt_transaction where transaction_id = transactions.id";
-push @groupby, "transactions.id";
+my $appliedtimeclause = "COALESCE (SUM(acct_rt_transaction.seconds), 0)";
-my $wheretimeleft = "($transactiontime != ($appliedtimeselect) OR ($appliedtimeselect) is NULL)";
+my $appliedtimeselect = "
+ COALESCE(
+ ( SELECT SUM(seconds) FROM acct_rt_transaction
+ WHERE transaction_id = Transactions.id
+ ),
+ 0
+ )
+";
-push @groupby, "tickets.id";
-push @groupby, "tickets.subject";
-push @groupby, "transactions.created";
+push @groupby, "Transactions.id";
+
+my $wheretimeleft = "$transactiontime != $appliedtimeselect";
+
+push @groupby, "Tickets.id";
+push @groupby, "Tickets.Subject";
+push @groupby, "Transactions.Created";
my $groupby = join(',', @groupby);
-my $query = "SELECT tickets.id,tickets.subject,to_char(transactions.created, 'Dy Mon DD HH24:MI:SS YYYY'),$transactiontime-$appliedtimeclause,transactions.id FROM transactions JOIN tickets ON transactions.objectid = tickets.id LEFT JOIN acct_rt_transaction on transactions.id = acct_rt_transaction.transaction_id WHERE objecttype='RT::Ticket' AND ((transactions.type='Set' AND field='TimeWorked') OR transactions.type='Comment' OR transactions.type='Correspond') AND ($wheretimeleft) GROUP BY $groupby ORDER BY transactions.created";
-my $count_query = "SELECT count(*) FROM transactions WHERE objecttype='RT::Ticket' AND ((transactions.type='Set' AND field='TimeWorked') OR transactions.type='Comment' OR transactions.type='Correspond') AND ($wheretimeleft)";
+my $where = "
+ WHERE ObjectType='RT::Ticket'
+ AND ( ( Transactions.Type='Set' AND Field='TimeWorked' )
+ 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 $html_form =
+ qq( <FORM NAME="timeForm" ACTION="${p}misc/timeworked.html" METHOD="POST"> );
+if ($cgi->param('category') =~ /^(\w+)$/) {
+ $where .= " AND ocfv_TimeType.Content = '$1'";
+ $html_form .= qq( <INPUT TYPE="hidden" NAME="category" VALUE="$1"> );
+}
+
+my $from = "
+ FROM Transactions
+ JOIN Tickets ON Transactions.ObjectId = Tickets.id
+ LEFT JOIN acct_rt_transaction
+ ON Transactions.id = acct_rt_transaction.transaction_id
+ LEFT JOIN (
+ SELECT DISTINCT ON (ObjectId)
+ ObjectId, Content
+ FROM ObjectCustomFieldValues
+ JOIN CustomFields
+ ON (ObjectCustomFieldValues.CustomField = CustomFields.Id)
+ WHERE CustomFields.Name = 'TimeType'
+ AND ObjectCustomFieldValues.ObjectType = 'RT::Ticket'
+ AND ObjectCustomFieldValues.Disabled = 0
+ ORDER BY ObjectId ASC, ObjectCustomFieldValues.LastUpdated DESC
+ ) AS ocfv_TimeType ON (Tickets.Id = ocfv_TimeType.ObjectId)
+";
+
+my $query = "
+ SELECT Tickets.id, Tickets.Subject,
+ TO_CHAR(Transactions.Created, 'Dy Mon DD HH24:MI:SS YYYY'),
+ $transactiontime-$appliedtimeclause,
+ Transactions.id
+ $from
+ $where
+ GROUP BY $groupby
+ ORDER BY Transactions.Created
+";
+
+my $count_query = "SELECT COUNT(*) $from $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>
projects / freeside.git / blobdiff