projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
search
/
timeworked.html
diff --git
a/httemplate/search/timeworked.html
b/httemplate/search/timeworked.html
index
d07cd4f
..
bbfd033
100644
(file)
--- a/
httemplate/search/timeworked.html
+++ b/
httemplate/search/timeworked.html
@@
-45,7
+45,9
@@
my @groupby = ();
my $transactiontime = "
CASE Transactions.Type WHEN 'Set'
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
";
ELSE TimeTaken*60
END
";
@@
-76,9
+78,7
@@
my $groupby = join(',', @groupby);
my $where = "
WHERE ObjectType='RT::Ticket'
AND ( ( Transactions.Type='Set' AND Field='TimeWorked' )
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
";