vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 40933 

Bug 53756
debug todayworktime???


git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@352 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
svnuser 2009-09-01 12:02:56 +00:00
parent 608f5e4474
commit 08b6fbbc3f
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fill-day-worktime.cgi
View File

@ -78,32 +78,27 @@ if (@idlist || @lines)
print $cgi->header();
my $query = $dbh->selectrow_array(
"SELECT query FROM namedqueries" .
" WHERE userid=? AND name = 'MyWorktimeBugs'",
undef, $userid
);
my ($query, $query_id) = Bugzilla::Search::LookupNamedQuery('MyWorktimeBugs', undef, undef, 0);
my $sqlquery = "";
if (defined($query))
if ($query_id)
{
my $queryparams = new Bugzilla::CGI($query);
my $search = new Bugzilla::Search(
params => $queryparams,
fields => [ "bugs.bug_id", "bugs.priority", "bugs.short_desc", "bugs.remaining_time" ],
user => $user
user => $user,
);
$sqlquery = $search->getSQL();
$sqlquery =~ s/GROUP\s+BY(\s+`?bugs\.[a-z_]+`?)+//iso;
}
$sqlquery = " UNION $sqlquery" if $sqlquery;
$sqlquery = " UNION ($sqlquery)" if $sqlquery;
my $bugsquery = "
SELECT t.bug_id, t.priority, t.short_desc,
ROUND(t.remaining_time,1) remaining_time, ROUND(SUM(l.work_time),2) all_work_time,
ROUND(SUM(IF(l.bug_when > CONCAT(DATE_SUB(CURDATE(),INTERVAL $lastdays DAY),' 23:59:59')
AND l.who=$userid,l.work_time,0)),2) today_work_time
ROUND(t.remaining_time,1) remaining_time, ROUND(SUM(l.work_time),2) all_work_time,
ROUND(SUM(IF(l.bug_when > CONCAT(DATE_SUB(CURDATE(),INTERVAL $lastdays DAY),' 23:59:59')
AND l.who=$userid,l.work_time,0)),2) today_work_time
FROM (
SELECT bugs.bug_id, bugs.priority, bugs.short_desc, bugs.remaining_time FROM longdescs ll, bugs
WHERE ll.bug_when > CONCAT(DATE_SUB(CURDATE(),INTERVAL $lastdays DAY),' 23:59:59') AND ll.who=$userid AND ll.bug_id=bugs.bug_id