2008-12-15 17:22:26 +03:00
|
|
|
#!/usr/bin/perl -wT
|
|
|
|
# -*- Mode: perl; indent-tabs-mode: nil -*-
|
|
|
|
# ------------------------------------------------------------------------
|
|
|
|
# For Bug 12253
|
|
|
|
|
|
|
|
use strict;
|
|
|
|
use lib qw(. lib);
|
|
|
|
|
|
|
|
use Bugzilla;
|
|
|
|
use Bugzilla::Bug;
|
2009-08-04 22:50:12 +04:00
|
|
|
use Bugzilla::Search;
|
2010-06-29 21:26:09 +04:00
|
|
|
use Bugzilla::Search::Saved;
|
2008-12-16 21:04:30 +03:00
|
|
|
use Bugzilla::Constants;
|
2008-12-15 17:22:26 +03:00
|
|
|
|
2010-10-01 18:20:33 +04:00
|
|
|
use BugWorkTime; # extensions/custis/lib/
|
|
|
|
|
2008-12-15 17:22:26 +03:00
|
|
|
my $user = Bugzilla->login(LOGIN_REQUIRED);
|
|
|
|
my $userid = $user->id;
|
|
|
|
|
|
|
|
my $cgi = Bugzilla->cgi;
|
|
|
|
my $template = Bugzilla->template;
|
|
|
|
my $dbh = Bugzilla->dbh;
|
|
|
|
my $vars = {};
|
|
|
|
|
|
|
|
# Read buglist from query params
|
|
|
|
my @idlist;
|
|
|
|
foreach my $i ($cgi->param())
|
|
|
|
{
|
|
|
|
if ($i =~ /^wtime_([1-9][0-9]*)/)
|
|
|
|
{
|
|
|
|
push @idlist, $1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
my ($lastdays) = $cgi->param('lastdays') =~ /^(\d+)$/;
|
|
|
|
$vars->{lastdays} = $lastdays ||= '1';
|
|
|
|
|
|
|
|
my %changedbugs;
|
|
|
|
foreach my $id (@idlist)
|
|
|
|
{
|
|
|
|
if (scalar($cgi->param("wtime_$id")) != 0 || $cgi->param("comm_$id") ||
|
|
|
|
scalar($cgi->param("oldrtime_$id")) != scalar($cgi->param("newrtime_$id")))
|
|
|
|
{
|
2009-08-24 18:54:10 +04:00
|
|
|
Bugzilla::Bug->check($id);
|
2008-12-15 17:22:26 +03:00
|
|
|
$changedbugs{$id} = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@idlist = keys %changedbugs;
|
|
|
|
my @lines = split("\n", $cgi->param("worktime"));
|
|
|
|
|
|
|
|
if (@idlist || @lines)
|
|
|
|
{
|
2010-10-01 18:20:33 +04:00
|
|
|
foreach my $id (@idlist)
|
2008-12-15 17:22:26 +03:00
|
|
|
{
|
2010-10-01 18:20:33 +04:00
|
|
|
$dbh->bz_start_transaction();
|
|
|
|
BugWorkTime::FixWorktime($id, scalar $cgi->param("wtime_$id"), scalar $cgi->param("comm_$id"));
|
|
|
|
$dbh->bz_commit_transaction();
|
2008-12-15 17:22:26 +03:00
|
|
|
}
|
|
|
|
if (@lines)
|
|
|
|
{
|
|
|
|
foreach my $line (@lines)
|
|
|
|
{
|
2010-10-29 17:51:32 +04:00
|
|
|
if ($line && $line =~ m/\s*(\d?\d.\d\d.[1-9]?\d?\d\d\s)?\s*((\d?\d):(\d\d)\s*-\s*(\d?\d):(\d\d)\s+)?([\w\/]+)\s*(-\s*(BUG|\()?\s*([1-9]\d*)(.*))/iso)
|
2008-12-15 17:22:26 +03:00
|
|
|
{
|
|
|
|
my $wtime = (($5 * 60 + $6) - ($3 * 60 + $4)) / 60;
|
|
|
|
$wtime = 0 if $wtime < 0;
|
|
|
|
my $id = $10;
|
|
|
|
my $comment = $line;
|
2010-10-29 17:51:32 +04:00
|
|
|
if (!$id)
|
|
|
|
{
|
|
|
|
ThrowUserError('object_not_specified', { class => 'Bugzilla::Bug' });
|
|
|
|
}
|
|
|
|
$dbh->bz_start_transaction();
|
2010-10-29 17:48:29 +04:00
|
|
|
BugWorkTime::FixWorktime($id, $wtime, $comment);
|
2010-10-29 17:51:32 +04:00
|
|
|
$dbh->bz_commit_transaction();
|
2008-12-15 17:22:26 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print $cgi->redirect(-location => "fill-day-worktime.cgi?lastdays=" . $lastdays);
|
|
|
|
exit;
|
|
|
|
}
|
|
|
|
|
2010-06-11 21:31:17 +04:00
|
|
|
$cgi->send_header();
|
2008-12-15 17:22:26 +03:00
|
|
|
|
2009-09-01 16:02:56 +04:00
|
|
|
my ($query, $query_id) = Bugzilla::Search::LookupNamedQuery('MyWorktimeBugs', undef, undef, 0);
|
2008-12-15 17:22:26 +03:00
|
|
|
|
|
|
|
my $sqlquery = "";
|
2009-09-01 16:02:56 +04:00
|
|
|
if ($query_id)
|
2008-12-15 17:22:26 +03:00
|
|
|
{
|
|
|
|
my $queryparams = new Bugzilla::CGI($query);
|
|
|
|
my $search = new Bugzilla::Search(
|
|
|
|
params => $queryparams,
|
2010-12-07 20:24:44 +03:00
|
|
|
fields => [ "bugs.bug_id" ],
|
2009-09-01 16:02:56 +04:00
|
|
|
user => $user,
|
2008-12-15 17:22:26 +03:00
|
|
|
);
|
|
|
|
$sqlquery = $search->getSQL();
|
|
|
|
}
|
|
|
|
|
2009-09-01 16:02:56 +04:00
|
|
|
$sqlquery = " UNION ($sqlquery)" if $sqlquery;
|
2008-12-15 17:22:26 +03:00
|
|
|
|
2010-12-06 17:04:25 +03:00
|
|
|
my $tm = "CURRENT_DATE - ".$dbh->sql_interval($lastdays-1, 'DAY');
|
|
|
|
|
2008-12-15 17:22:26 +03:00
|
|
|
my $bugsquery = "
|
2010-12-06 17:04:25 +03:00
|
|
|
SELECT b.bug_id, b.priority, b.short_desc, p.name product, c.name component,
|
|
|
|
ROUND(b.remaining_time,1) remaining_time,
|
|
|
|
ROUND(SUM(l.work_time),2) all_work_time,
|
|
|
|
ROUND(SUM(
|
|
|
|
CASE WHEN l.bug_when >= $tm AND l.who=$userid
|
|
|
|
THEN l.work_time
|
|
|
|
ELSE 0 END
|
|
|
|
),2) today_work_time
|
2010-12-07 18:53:20 +03:00
|
|
|
FROM bugs b
|
|
|
|
LEFT JOIN longdescs l ON l.bug_id=b.bug_id
|
|
|
|
INNER JOIN products p ON p.id=b.product_id
|
|
|
|
INNER JOIN components c ON c.id=b.component_id
|
|
|
|
INNER JOIN (
|
2010-12-06 17:04:25 +03:00
|
|
|
SELECT bugs.bug_id FROM longdescs ll, bugs
|
|
|
|
WHERE ll.bug_when >= $tm AND ll.who=? AND ll.bug_id=bugs.bug_id
|
2008-12-15 17:22:26 +03:00
|
|
|
UNION
|
2010-12-06 17:04:25 +03:00
|
|
|
SELECT bugs.bug_id FROM bugs_activity aa, bugs
|
|
|
|
WHERE aa.bug_when >= $tm AND aa.who=? AND aa.bug_id=bugs.bug_id
|
2008-12-15 17:22:26 +03:00
|
|
|
$sqlquery
|
2010-12-07 18:53:20 +03:00
|
|
|
) t ON t.bug_id=b.bug_id
|
2010-12-06 17:04:25 +03:00
|
|
|
GROUP BY b.bug_id, b.priority, b.short_desc, p.name, c.name, b.remaining_time
|
2008-12-15 17:22:26 +03:00
|
|
|
ORDER BY today_work_time DESC, priority ASC
|
|
|
|
";
|
|
|
|
|
2010-12-06 17:04:25 +03:00
|
|
|
$vars->{bugs} = $dbh->selectall_arrayref($bugsquery, {Slice=>{}}, $userid, $userid) || [];
|
2008-12-15 17:22:26 +03:00
|
|
|
|
|
|
|
($vars->{timestamp}) = $dbh->selectrow_array("SELECT NOW()");
|
2010-12-06 17:04:25 +03:00
|
|
|
($vars->{totaltime}) = $dbh->selectrow_array("SELECT ROUND(SUM(work_time),2) FROM longdescs WHERE bug_when >= CURRENT_DATE - ".$dbh->sql_interval('?', 'DAY')." AND who=?", undef, $lastdays-1, $userid);
|
|
|
|
($vars->{prevdate1}) = $dbh->selectrow_array("SELECT DATE(MAX(bug_when)) FROM longdescs WHERE bug_when < CURRENT_DATE AND who=?", undef, $userid);
|
2008-12-15 17:22:26 +03:00
|
|
|
|
|
|
|
$vars->{totaltime} ||= 0;
|
|
|
|
|
|
|
|
$template->process('worktime/todaybugs.html.tmpl', $vars)
|
|
|
|
|| ThrowTemplateError($template->error());
|
|
|
|
|
|
|
|
exit;
|