From: Robert V. D. v. a. <we...@ma...> - 2005-02-04 20:20:28
|
Log Message: ----------- Added friendly message when no set is selected. Fixes #750 Modified Files: -------------- webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor: Scoring.pm Revision Data ------------- Index: Scoring.pm =================================================================== RCS file: /webwork/cvs/system/webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm,v retrieving revision 1.38 retrieving revision 1.39 diff -Llib/WeBWorK/ContentGenerator/Instructor/Scoring.pm -Llib/WeBWorK/ContentGenerator/Instructor/Scoring.pm -u -r1.38 -r1.39 --- lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm +++ lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm @@ -49,13 +49,13 @@ return unless $authz->hasPermissions($user, "access_instructor_tools"); return unless $authz->hasPermissions($user, "score_sets"); - if (defined $r->param('scoreSelected')) { - my @selected = $r->param('selectedSet'); + my @selected = $r->param('selectedSet'); + my $scoreSelected = $r->param('scoreSelected'); + if (defined $scoreSelected && @selected) { + my @totals = (); my $recordSingleSetScores = $r->param('recordSingleSetScores'); - $self->addmessage(CGI::div({class=>'ResultsWithError'},"You must select one or more sets for scoring")) unless @selected; - # pre-fetch users $WeBWorK::timer->continue("pre-fetching users") if defined($WeBWorK::timer); my @Users = $db->getUsers($db->listUsers); @@ -94,7 +94,10 @@ my @sum_scores = $self->sumScores(\@totals, $showIndex, \%Users, \@sortedUserIDs); $self->appendColumns( \@totals,\@sum_scores); $self->writeCSV("$scoringDir/${courseName}_totals.csv", @totals); - } + + } elsif (defined $scoreSelected) { + $self->addbadmessage("You must select one or more sets for scoring"); + } # Obtaining list of sets: #$WeBWorK::timer->continue("Begin listing sets") if defined $WeBWorK::timer; |