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

Bug 60898 - Prod/comp in todayworktime 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@669 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2010-03-01 16:27:39 +00:00
parent 25bb7dfbb4
commit e8535b6ba3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fill-day-worktime.cgi
View File

@ -86,7 +86,7 @@ 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" ],
fields => [ "bugs.bug_id", "bugs.priority", "bugs.short_desc", "bugs.remaining_time", "bugs.product_id", "bugs.component_id" ],
user => $user,
);
$sqlquery = $search->getSQL();
@ -95,19 +95,19 @@ if ($query_id)
$sqlquery = " UNION ($sqlquery)" if $sqlquery;
my $bugsquery = "
SELECT t.bug_id, t.priority, t.short_desc,
SELECT t.bug_id, t.priority, t.short_desc, p.name product, c.name component,
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
SELECT bugs.bug_id, bugs.priority, bugs.short_desc, bugs.remaining_time, bugs.product_id, bugs.component_id 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
UNION
SELECT bugs.bug_id, bugs.priority, bugs.short_desc, bugs.remaining_time FROM bugs_activity aa, bugs
SELECT bugs.bug_id, bugs.priority, bugs.short_desc, bugs.remaining_time, bugs.product_id, bugs.component_id FROM bugs_activity aa, bugs
WHERE aa.bug_when > CONCAT(DATE_SUB(CURDATE(),INTERVAL $lastdays DAY),' 23:59:59') AND aa.who=$userid AND aa.bug_id=bugs.bug_id
$sqlquery
) t, longdescs l
WHERE t.bug_id = l.bug_id
) t, longdescs l, products p, components c
WHERE t.bug_id = l.bug_id AND t.product_id=p.id AND t.component_id=c.id
GROUP BY t.bug_id
ORDER BY today_work_time DESC, priority ASC
";

4
template/en/custom/worktime/todaybugs.html.tmpl
View File

@ -69,6 +69,7 @@ textarea {
<table class="bz_buglist" cellspacing="2" cellpadding="3" border="1" style="border-style:groove" width="100%">
<tr bgcolor="lightgrey">
<th width="30">Bug</th>
<th>Prod/Comp</th>
<th>Summary</th>
<th width="130" colspan="3"><small>[% PROCESS today_or_lastdays %]</small><br/>Hours Worked</th>
<th width="320" >Comment</th>
@ -83,6 +84,9 @@ textarea {
<td class="first-child" align="right">
[% bug.bug_id FILTER bug_link(bug.bug_id) %]
</td>
<td>
[% bug.product | html %]/[% bug.component | html %]
</td>
<td>
[% bug.short_desc FILTER html %]
</td>