oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issue which caused time tracker to complete on post and not allow you to make changes

Browse source
This commit is contained in:
Frank Dillon 2008-06-20 20:05:45 +00:00
parent 05cf8fa24c
commit bba9788f92
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/WebGUI/Asset/Wobject/TimeTracking.pm
View file

@ -251,8 +251,10 @@ sub www_editTimeEntrySave {
# Clobber other entries. We can't just do this beforehand # Clobber other entries. We can't just do this beforehand
# because otherwise setCollateral will fail. # because otherwise setCollateral will fail.
$db->write("DELETE FROM TT_timeEntry WHERE reportId = ? AND entryId NOT IN (".join(', ', ('?') x @entryIds).")", [$reportId, @entryIds]); if(scalar(@entryIds) > 0) {
$db->write("DELETE FROM TT_timeEntry WHERE reportId = ? AND entryId NOT IN (".join(', ', ('?') x @entryIds).")", [$reportId, @entryIds]);
}
# Update Project Management App if integrated # Update Project Management App if integrated
if ($self->getValue("pmIntegration")) { if ($self->getValue("pmIntegration")) {
foreach my $projectId (keys %deltaHours) { foreach my $projectId (keys %deltaHours) {
@ -701,12 +703,11 @@ sub www_buildTimeTable {
}); });
my $reportComplete = $report->{reportComplete}; my $reportComplete = $report->{reportComplete};
$viewVar->{'form.isComplete'} = WebGUI::Form::checkbox($session, { $var->{'form.isComplete'} = WebGUI::Form::checkbox($session, {
-name=>"isComplete", -name=>"isComplete",
-value=>1, -value=>1,
-checked=>$reportComplete -checked=>$reportComplete
}); });
#Build Entries Loop #Build Entries Loop
my $entries = $db->buildArrayRefOfHashRefs("select * from TT_timeEntry where reportId=? order by taskDate",[$reportId]); my $entries = $db->buildArrayRefOfHashRefs("select * from TT_timeEntry where reportId=? order by taskDate",[$reportId]);
my $rowCount = 1; my $rowCount = 1;
@ -742,12 +743,12 @@ sub _buildRow {
my ($session,$dt,$eh,$form,$db,$user) = $self->getSessionVars("datetime","errorHandler","form","db","user"); my ($session,$dt,$eh,$form,$db,$user) = $self->getSessionVars("datetime","errorHandler","form","db","user");
my $i18n = WebGUI::International->new($session,'Asset_TimeTracking'); my $i18n = WebGUI::International->new($session,'Asset_TimeTracking');
my $entry = $_[0] || {}; my $entry = $_[0] || {};
my $rowCount = $_[1]; my $rowCount = $_[1];
my $daysInWeek = $_[2]; my $daysInWeek = $_[2];
my $projectList = $_[3]; my $projectList = $_[3];
my $taskList = $_[4]; my $taskList = $_[4];
my $var = $_[5] || {}; my $var = $_[5] || {};
my $reportComplete = $_[6] || 0; my $reportComplete = $_[6] || 0;
my $entryId = $entry->{entryId} || "new"; my $entryId = $entry->{entryId} || "new";

2
lib/WebGUI/Form/Checkbox.pm
View file

@ -64,7 +64,7 @@ sub definition {
defaultValue=> 0 defaultValue=> 0
}, },
defaultValue=>{ defaultValue=>{
defaultValue=>1 defaultValue=>undef
}, },
}); });
return $class->SUPER::definition($session, $definition); return $class->SUPER::definition($session, $definition);

3
lib/WebGUI/FormValidator.pm
View file

@ -161,8 +161,7 @@ sub process {
die __PACKAGE__."::process requires an href" unless ref $args eq 'HASH'; die __PACKAGE__."::process requires an href" unless ref $args eq 'HASH';
my ($name, $type, $default, $params) = @$args{qw( name type default params )}; my ($name, $type, $default, $params) = @$args{qw( name type default params )};
$params->{name} = $name;
$params->{name} = $name;
if (wantarray) { if (wantarray) {
my @values = $self->$type($params); my @values = $self->$type($params);
if (scalar(@values) < 1 && ref $default eq "ARRAY") { if (scalar(@values) < 1 && ref $default eq "ARRAY") {