--- loncom/homework/grades.pm 2023/09/07 17:38:56 1.596.2.12.2.60.2.5 +++ loncom/homework/grades.pm 2020/11/09 00:44:30 1.778 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.596.2.12.2.60.2.5 2023/09/07 17:38:56 raeburn Exp $ +# $Id: grades.pm,v 1.778 2020/11/09 00:44:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,6 +44,7 @@ use Apache::Constants qw(:common :http); use Apache::lonlocal; use Apache::lonenc; use Apache::lonstathelpers; +use Apache::lonquickgrades; use Apache::bridgetask(); use Apache::lontexconvert(); use String::Similarity; @@ -146,7 +147,6 @@ sub nameUserString { } #--- Get the partlist and the response type for a given problem. --- -#--- Indicate if a response type is coded handgraded or not. --- #--- Count responseIDs, essayresponse items, and dropbox items --- #--- Sets response_error pointer to "1" if navmaps object broken --- sub response_type { @@ -1166,33 +1166,8 @@ LISTJAVASCRIPT $nocompmsg = ''; } $gradeTable .= &Apache::lonhtmlcommon::row_title($viewtitle) - .$submission_options; -# Check if any gradable - my $showmore; - if ($perm{'mgr'}) { - my @sections; - if ($env{'request.course.sec'} ne '') { - @sections = ($env{'request.course.sec'}); - } elsif ($env{'form.section'} eq '') { - @sections = ('all'); - } else { - @sections = &Apache::loncommon::get_env_multiple('form.section'); - } - if (grep(/^all$/,@sections)) { - $showmore = 1; - } else { - foreach my $sec (@sections) { - if (&canmodify($sec)) { - $showmore = 1; - last; - } - } - } - } - - if ($showmore) { - $gradeTable .= - &Apache::lonhtmlcommon::row_closure() + .$submission_options + .&Apache::lonhtmlcommon::row_closure() .&Apache::lonhtmlcommon::row_title(&mt('Send Messages')) .'' .'' .&Apache::lonhtmlcommon::row_closure(); - $gradeTable .= - &Apache::lonhtmlcommon::row_title(&mt('Grading Increments')) + $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments')) .''; - } $gradeTable .= &build_section_inputs(). ''."\n". ''."\n". ''."\n"; if (exists($env{'form.Status'})) { - $gradeTable .= ''."\n"; + $gradeTable .= ''."\n"; } else { $gradeTable .= &Apache::lonhtmlcommon::row_closure() .&Apache::lonhtmlcommon::row_title(&mt('Student Status')) @@ -1799,6 +1772,7 @@ INNERJS function msgTail() { pDoc = pWin.document; + //pDoc.write("<\\/table>"); pDoc.write("<\\/td><\\/tr><\\/table> "); pDoc.write("  "); pDoc.write("

"); @@ -2118,7 +2092,7 @@ sub handback_box { if ($file =~ /\/portfolio\//) { $file_counter++; my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|); - my ($name,$version,$ext) = &file_name_version_ext($file_disp); + my ($name,$version,$ext) = &Apache::lonnet::file_name_version_ext($file_disp); $file_disp = "$name.$ext"; $file = $file_path.$file_disp; $result.=&mt('Return commented version of [_1] to student.', @@ -2205,7 +2179,7 @@ sub files_exist { my ($uname,$udom,$fullname) = split(/:/,$student); my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'}, $udom,$uname); - my ($string)= &get_last_submission(\%record); + my ($string,$timestamp)= &get_last_submission(\%record); foreach my $submission (@$string) { my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); @@ -2330,7 +2304,7 @@ sub submission { } if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; } - unless ($is_tool) { + unless ($is_tool) { if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; } if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; } } @@ -2557,19 +2531,176 @@ sub submission { # (3) All transactions (by date) # (4) The whole record (with detailed information for all transactions) - my ($lastsubonly,$partinfo) = - &show_last_submission($uname,$udom,$symb,$essayurl,$responseType,$env{'form.lastSub'}, - $is_tool,$fullname,\%record,\%coursedesc_by_cid); - $request->print($partinfo); - $request->print($lastsubonly); + my ($string,$timestamp)= &get_last_submission(\%record,$is_tool); + + my $lastsubonly; + + if ($$timestamp eq '') { + $lastsubonly.='
'.$$string[0].'
'; + } elsif ($is_tool) { + $lastsubonly = + '
' + .''.&mt('Date Grade Passed Back:').' '.$$timestamp."
\n"; + } else { + $lastsubonly = + '
' + .''.&mt('Date Submitted:').' '.$$timestamp."\n"; + my %seenparts; + my @part_response_id = &flatten_responseType($responseType); + foreach my $part (@part_response_id) { + my ($partid,$respid) = @{ $part }; + my $display_part=&get_display_part($partid,$symb); + if ($env{"form.$uname:$udom:$partid:submitted_by"}) { + if (exists($seenparts{$partid})) { next; } + $seenparts{$partid}=1; + $request->print( + ''.&mt('Part: [_1]',$display_part).''. + ' '.&mt('Collaborative submission by: [_1]', + ''. + $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.''). + '
'); + next; + } + my $responsetype = $responseType->{$partid}->{$respid}; + if (!exists($record{"resource.$partid.$respid.submission"})) { + $lastsubonly.="\n".'
'. + ''.&mt('Part: [_1]',$display_part).''. + ' '. + '('.&mt('Response ID: [_1]',$respid).')'. + '   '. + ''.&mt('Nothing submitted - no attempts.').'

'; + next; + } + foreach my $submission (@$string) { + my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); + if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; } + my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4); + # Similarity check + my $similar=''; + my ($type,$trial,$rndseed); + if ($hide eq 'rand') { + $type = 'randomizetry'; + $trial = $record{"resource.$partid.tries"}; + $rndseed = $record{"resource.$partid.rndseed"}; + } + if ($env{'form.checkPlag'}) { + my ($oname,$odom,$ocrsid,$oessay,$osim)= + &most_similar($uname,$udom,$symb,$subval); + if ($osim) { + $osim=int($osim*100.0); + if ($hide eq 'anon') { + $similar='
'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'
'. + &mt('As the current submission is for an anonymous survey, no other details are available.').'
'; + } else { + $similar='
'; + if ($essayurl eq 'lib/templates/simpleproblem.problem') { + $similar .= '

'. + &mt('Essay is [_1]% similar to an essay by [_2]', + $osim, + &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')'). + '

'; + } else { + my %old_course_desc; + if ($ocrsid ne '') { + if (ref($coursedesc_by_cid{$ocrsid}) eq 'HASH') { + %old_course_desc = %{$coursedesc_by_cid{$ocrsid}}; + } else { + my $args; + if ($ocrsid ne $env{'request.course.id'}) { + $args = {'one_time' => 1}; + } + %old_course_desc = + &Apache::lonnet::coursedescription($ocrsid,$args); + $coursedesc_by_cid{$ocrsid} = \%old_course_desc; + } + $similar .= + '

'. + &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', + $osim, + &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', + $old_course_desc{'description'}, + $old_course_desc{'num'}, + $old_course_desc{'domain'}). + '

'; + } else { + $similar .= + '

'. + &mt('Essay is [_1]% similar to an essay by [_2] in an unknown course', + $osim, + &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')'). + '

'; + } + } + $similar .= '
'. + &keywords_highlight($oessay). + '
'; + } + } + } + my $order=&get_order($partid,$respid,$symb,$uname,$udom, + undef,$type,$trial,$rndseed); + if (($env{'form.lastSub'} eq 'lastonly') || + ($env{'form.lastSub'} eq 'datesub') || + ($env{'form.lastSub'} =~ /^(last|all)$/)) { + my $display_part=&get_display_part($partid,$symb); + $lastsubonly.='
'. + ''.&mt('Part: [_1]',$display_part).''. + ' '. + '('.&mt('Response ID: [_1]',$respid).')'. + '   '; + my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); + if (@$files) { + if ($hide eq 'anon') { + $lastsubonly.='
'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files})); + } else { + $lastsubonly.='

'.''.&mt('Submitted Files:').'' + .'
'; + if(@$files == 1) { + $lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!'); + } else { + $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!'); + } + $lastsubonly .= ''; + foreach my $file (@$files) { + &Apache::lonnet::allowuploaded('/adm/grades',$file); + $lastsubonly.='
'.$file.''; + } + } + $lastsubonly.='
'; + } + if ($hide eq 'anon') { + $lastsubonly.='
'.&mt('Anonymous Survey').''; + } else { + $lastsubonly.='
'.&mt('Submitted Answer:').' '; + if ($draft) { + $lastsubonly.= ' '.&mt('Draft Copy').''; + } + $subval = + &cleanRecord($subval,$responsetype,$symb,$partid, + $respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed); + if ($responsetype eq 'essay') { + $subval =~ s{\n}{
}g; + } + $lastsubonly.=$subval."\n"; + } + if ($similar) {$lastsubonly.="

$similar\n";} + $lastsubonly.='
'; + } + } + } + $lastsubonly.='
'."\n"; # End: LC_grade_submissions_body + } + $request->print($lastsubonly); if ($env{'form.lastSub'} eq 'datesub') { my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error); $request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom)); } if ($env{'form.lastSub'} =~ /^(last|all)$/) { my $identifier = (&canmodify($usec)? $counter : ''); - $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, + $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, $env{'request.course.id'}, $last,'.submission', 'Apache::grades::keywords_highlight', @@ -2579,8 +2710,8 @@ sub submission { .$udom.'" />'."\n"); # return if view submission with no grading option if (!&canmodify($usec)) { - $request->print('

'.&mt('No grading privileges').'

'); - return; + $request->print('

'.&mt('No grading privileges').'

'); + return; } else { $request->print(''."\n"); } @@ -2600,7 +2731,7 @@ sub submission { $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript $result.=''."\n". ''."\n". - ' '. &mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).')'. @@ -2608,7 +2739,7 @@ sub submission { '/mailbkgrd.gif" width="14" height="10" alt="" name="mailicon'.$counter.'" />'."\n". '
 ('. &mt('Message will be sent when you click on Save & Next below.').")\n". - ''; + ''; $request->print($result); } @@ -2686,186 +2817,6 @@ sub submission { return ''; } -sub show_last_submission { - my ($uname,$udom,$symb,$essayurl,$responseType,$viewtype,$is_tool,$fullname, - $record,$coursedesc_by_cid) = @_; - my ($string,$timestamp,$lastgradetime,$lastsubmittime) = - &get_last_submission($record,$is_tool); - - my ($lastsubonly,$partinfo); - if ($timestamp eq '') { - $lastsubonly.='
'.$string->[0].'
'; - } elsif ($is_tool) { - $lastsubonly = - '
' - .''.&mt('Date Grade Passed Back:').' '.$timestamp."
\n"; - } else { - my ($shownsubmdate,$showngradedate); - if ($lastsubmittime && $lastgradetime) { - $shownsubmdate = &Apache::lonlocal::locallocaltime($lastsubmittime); - if ($lastgradetime > $lastsubmittime) { - $showngradedate = &Apache::lonlocal::locallocaltime($lastgradetime); - } - } else { - $shownsubmdate = $timestamp; - } - $lastsubonly = - '
' - .''.&mt('Date Submitted:').' '.$shownsubmdate."\n"; - if ($showngradedate) { - $lastsubonly .= '
'.&mt('Date Graded:').' '.$showngradedate."\n"; - } - - my %seenparts; - my @part_response_id = &flatten_responseType($responseType); - foreach my $part (@part_response_id) { - my ($partid,$respid) = @{ $part }; - my $display_part=&get_display_part($partid,$symb); - if ($env{"form.$uname:$udom:$partid:submitted_by"}) { - if (exists($seenparts{$partid})) { next; } - $seenparts{$partid}=1; - $partinfo .= - ''.&mt('Part: [_1]',$display_part).''. - ' '.&mt('Collaborative submission by: [_1]', - ''. - $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.''). - '
'; - next; - } - my $responsetype = $responseType->{$partid}->{$respid}; - if (!exists($record->{"resource.$partid.$respid.submission"})) { - $lastsubonly.="\n".'
'. - ''.&mt('Part: [_1]',$display_part).''. - ' '. - '('.&mt('Response ID: [_1]',$respid).')'. - '   '. - ''.&mt('Nothing submitted - no attempts.').'

'; - next; - } - foreach my $submission (@$string) { - my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); - if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; } - my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4); - # Similarity check - my $similar=''; - my ($type,$trial,$rndseed); - if ($hide eq 'rand') { - $type = 'randomizetry'; - $trial = $record->{"resource.$partid.tries"}; - $rndseed = $record->{"resource.$partid.rndseed"}; - } - if ($env{'form.checkPlag'}) { - my ($oname,$odom,$ocrsid,$oessay,$osim)= - &most_similar($uname,$udom,$symb,$subval); - if ($osim) { - $osim=int($osim*100.0); - if ($hide eq 'anon') { - $similar='
'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'
'. - &mt('As the current submission is for an anonymous survey, no other details are available.').'
'; - } else { - $similar='
'; - if ($essayurl eq 'lib/templates/simpleproblem.problem') { - $similar .= '

'. - &mt('Essay is [_1]% similar to an essay by [_2]', - $osim, - &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')'). - '

'; - } else { - my %old_course_desc; - if ($ocrsid ne '') { - if (ref($coursedesc_by_cid->{$ocrsid}) eq 'HASH') { - %old_course_desc = %{$coursedesc_by_cid->{$ocrsid}}; - } else { - my $args; - if ($ocrsid ne $env{'request.course.id'}) { - $args = {'one_time' => 1}; - } - %old_course_desc = - &Apache::lonnet::coursedescription($ocrsid,$args); - $coursedesc_by_cid->{$ocrsid} = \%old_course_desc; - } - $similar .= - '

'. - &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', - $osim, - &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', - $old_course_desc{'description'}, - $old_course_desc{'num'}, - $old_course_desc{'domain'}). - '

'; - } else { - $similar .= - '

'. - &mt('Essay is [_1]% similar to an essay by [_2] in an unknown course', - $osim, - &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')'). - '

'; - } - } - $similar .= '
'. - &keywords_highlight($oessay). - '
'; - } - } - } - my $order=&get_order($partid,$respid,$symb,$uname,$udom, - undef,$type,$trial,$rndseed); - if (($viewtype eq 'lastonly') || - ($viewtype eq 'datesub') || - ($viewtype =~ /^(last|all)$/)) { - my $display_part=&get_display_part($partid,$symb); - $lastsubonly.='
'. - ''.&mt('Part: [_1]',$display_part).''. - ' '. - '('.&mt('Response ID: [_1]',$respid).')'. - '   '; - my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record); - if (@$files) { - if ($hide eq 'anon') { - $lastsubonly.='
'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files})); - } else { - $lastsubonly.='

'.''.&mt('Submitted Files:').'' - .'
'; - if(@$files == 1) { - $lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!'); - } else { - $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!'); - } - $lastsubonly .= ''; - foreach my $file (@$files) { - &Apache::lonnet::allowuploaded('/adm/grades',$file); - $lastsubonly.='
'.$file.''; - } - } - $lastsubonly.='
'; - } - if ($hide eq 'anon') { - $lastsubonly.='
'.&mt('Anonymous Survey').''; - } else { - $lastsubonly.='
'.&mt('Submitted Answer:').' '; - if ($draft) { - $lastsubonly.= ' '.&mt('Draft Copy').''; - } - $subval = - &cleanRecord($subval,$responsetype,$symb,$partid, - $respid,$record,$order,undef,$uname,$udom,$type,$trial,$rndseed); - if ($responsetype eq 'essay') { - $subval =~ s{\n}{
}g; - } - $lastsubonly.=$subval."\n"; - } - if ($similar) {$lastsubonly.="

$similar\n";} - $lastsubonly.='
'; - } - } - } - $lastsubonly.='
'."\n"; # End: LC_grade_submissions_body - } - return ($lastsubonly,$partinfo); -} - sub check_collaborators { my ($symb,$uname,$udom,$record,$handgrade,$counter) = @_; my ($result,@col_fullnames); @@ -2925,45 +2876,17 @@ sub check_collaborators { #--- Retrieve the last submission for all the parts sub get_last_submission { my ($returnhash,$is_tool)=@_; - my (@string,$timestamp,$lastgradetime,$lastsubmittime); + my (@string,$timestamp,%lasthidden); if ($$returnhash{'version'}) { my %lasthash=(); - my %prevsolved=(); - my %solved=(); - my $version; + my ($version); for ($version=1;$version<=$$returnhash{'version'};$version++) { - my %handgraded = (); foreach my $key (sort(split(/\:/, $$returnhash{$version.':keys'}))) { $lasthash{$key}=$$returnhash{$version.':'.$key}; - if ($key =~ /\.([^.]+)\.regrader$/) { - $handgraded{$1} = 1; - } elsif ($key =~ /\.portfiles$/) { - if (($$returnhash{$version.':'.$key} ne '') && - ($$returnhash{$version.':'.$key} !~ /\.\d+\.\w+$/)) { - $lastsubmittime = $$returnhash{$version.':timestamp'}; - } - } elsif ($key =~ /\.submission$/) { - if ($$returnhash{$version.':'.$key} ne '') { - $lastsubmittime = $$returnhash{$version.':timestamp'}; - } - } elsif ($key =~ /\.([^.]+)\.solved$/) { - $prevsolved{$1} = $solved{$1}; - $solved{$1} = $lasthash{$key}; - } - } - foreach my $partid (keys(%handgraded)) { - if (($prevsolved{$partid} eq 'ungraded_attempted') && - (($solved{$partid} eq 'incorrect_by_override') || - ($solved{$partid} eq 'correct_by_override'))) { - $lastgradetime = $$returnhash{$version.':timestamp'}; - } - if ($solved{$partid} ne '') { - $prevsolved{$partid} = $solved{$partid}; - } - } - $timestamp = - &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'}); + $timestamp = + &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'}); + } } my (%typeparts,%randombytry); my $showsurv = @@ -3027,7 +2950,7 @@ sub get_last_submission { $string[0] = ''.$msg.''; } - return (\@string,$timestamp,$lastgradetime,$lastsubmittime); + return (\@string,\$timestamp); } #--- High light keywords, with style choosen by user. @@ -3057,11 +2980,12 @@ sub show_previous_task_version { my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'}); my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'}); if (!&canview($usec)) { - $request->print(''. - &mt('Unable to view previous version for requested student.'). - ' '.&mt('([_1] in section [_2] in course id [_3])', - $uname.':'.$udom,$usec,$env{'request.course.id'}). - ''); + $request->print( + ''. + &mt('Unable to view previous version for requested student.'). + ' '.&mt('([_1] in section [_2] in course id [_3])', + $uname.':'.$udom,$usec,$env{'request.course.id'}). + ''); return; } my $mode = 'both'; @@ -3233,37 +3157,19 @@ sub processHandGrade { my $ntstu = $env{'form.NTSTU'}; my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my ($res_error,%queueable); - my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error); - if ($res_error) { - $request->print(&navmap_errormsg()); - return; - } else { - foreach my $part (@{$partlist}) { - if (ref($responseType->{$part}) eq 'HASH') { - foreach my $id (keys(%{$responseType->{$part}})) { - if (($responseType->{$part}->{$id} eq 'essay') || - (lc($handgrade->{$part.'_'.$id}) eq 'yes')) { - $queueable{$part} = 1; - last; - } - } - } - } - } if ($button eq 'Save & Next') { my $ctr = 0; while ($ctr < $ngrade) { my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr}); my ($errorflag,$pts,$wgt,$numhidden) = - &saveHandGrade($request,$symb,$uname,$udom,$ctr,undef,undef,\%queueable); + &saveHandGrade($request,$symb,$uname,$udom,$ctr); if ($errorflag eq 'no_score') { $ctr++; next; } if ($errorflag eq 'not_allowed') { - $request->print( + $request->print( '' .&mt('Not allowed to modify grades for [_1]',"$uname:$udom") .''); @@ -3312,7 +3218,7 @@ sub processHandGrade { foreach my $collaborator (@collaborators) { my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$collaborator,$udom,$ctr, - $env{'form.unamedom'.$ctr},$part,\%queueable); + $env{'form.unamedom'.$ctr},$part); if ($errorflag eq 'not_allowed') { $request->print("".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom").""); next; @@ -3334,6 +3240,13 @@ sub processHandGrade { } } + my $res_error; + my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error); + if ($res_error) { + $request->print(&navmap_errormsg()); + return; + } + my %keyhash = (); if ($numessay) { # Keywords sorted in alphabatical order @@ -3364,9 +3277,9 @@ sub processHandGrade { $ctr = 0; while ($ctr < $ngrade) { if ($env{'form.newmsg'.$ctr} ne '') { - $keyhash{$symb.'_savemsg'.$idx} = $env{'form.newmsg'.$ctr}; - $env{'form.savemsg'.$idx} = $env{'form.newmsg'.$ctr}; - $idx++; + $keyhash{$symb.'_savemsg'.$idx} = $env{'form.newmsg'.$ctr}; + $env{'form.savemsg'.$idx} = $env{'form.newmsg'.$ctr}; + $idx++; } $ctr++; } @@ -3374,8 +3287,8 @@ sub processHandGrade { $keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'}; } if (($numessay) || ($env{'form.compmsg'})) { - my $putresult = &Apache::lonnet::put - ('nohist_handgrade',\%keyhash,$cdom,$cnum); + my $putresult = &Apache::lonnet::put + ('nohist_handgrade',\%keyhash,$cdom,$cnum); } # Called by Save & Refresh from Highlight Attribute Window @@ -3477,7 +3390,7 @@ sub processHandGrade { $ctr++; } if ($total < 0) { - my $the_end.='

'.&mt('[_1]Message:[_2] No more students for this section or class.','','').'

'."\n"; + my $the_end.='

'.&mt('[_1]Message:[_2] No more students for this section or class.','','').'

'."\n"; $request->print($the_end); } return ''; @@ -3485,7 +3398,7 @@ sub processHandGrade { #---- Save the score and award for each student, if changed sub saveHandGrade { - my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part,$queueable) = @_; + my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_; my @version_parts; my $usec = &Apache::lonnet::getsection($domain,$stuname, $env{'request.course.id'}); @@ -3597,7 +3510,7 @@ sub saveHandGrade { &Apache::lonnet::cstore(\%newrecord,$symb, $env{'request.course.id'},$domain,$stuname); &check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb, - $cdom,$cnum,$domain,$stuname,$queueable); + $cdom,$cnum,$domain,$stuname); } if ($aggregateflag) { &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate, @@ -3637,7 +3550,7 @@ sub makehidden { } sub check_and_remove_from_queue { - my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname,$queueable) = @_; + my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_; my @ungraded_parts; foreach my $part (@{$parts}) { if ( $record->{ 'resource.'.$part.'.awarded'} eq '' @@ -3645,9 +3558,7 @@ sub check_and_remove_from_queue { && $newrecord->{'resource.'.$part.'.awarded'} eq '' && $newrecord->{'resource.'.$part.'.solved' } ne 'excused' ) { - if ($queueable->{$part}) { - push(@ungraded_parts, $part); - } + push(@ungraded_parts, $part); } } if ( !@ungraded_parts ) { @@ -3673,19 +3584,19 @@ sub handback_files { my $part_resp = join('_',@{ $part_response_id }); if (($env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'} =~ /^\d+$/) & ($new_part eq $part_id)) { for (my $counter=1; $counter<=$env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'}; $counter++) { - # if multiple files are uploaded names will be 'returndoc2','returndoc3' - if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) { + # if multiple files are uploaded names will be 'returndoc2','returndoc3' + if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) { my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'}; my ($directory,$answer_file) = ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.*?)([^\/]*)$/); my ($answer_name,$answer_ver,$answer_ext) = - &file_name_version_ext($answer_file); + &Apache::lonnet::file_name_version_ext($answer_file); my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/); my $getpropath = 1; my ($dir_list,$listerror) = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path, $domain,$stuname,$getpropath); - my $version = &get_next_version($answer_name,$answer_ext,$dir_list); + my $version = &Apache::lonnet::get_next_version($answer_name,$answer_ext,$dir_list); # fix filename my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/); my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain, @@ -3703,8 +3614,7 @@ sub handback_files { $$newrecord{"resource.$new_part.$resp_id.handback"}.=','; } $$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name; - $file_msg.=''.$save_file_name."
"; - + $file_msg.= ''.$save_file_name."
"; } $request->print('
'.&mt('[_1] will be the uploaded filename [_2]',''.$fname.'',''.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'')); } @@ -3715,7 +3625,7 @@ sub handback_files { $request->print('
'); my @what = ($symb,$env{'request.course.id'},'handback'); &Apache::lonnet::mark_as_readonly($domain,$stuname,\@handedback,\@what); - my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'}); + my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'}); my ($subject,$message); if (scalar(@handedback) == 1) { $subject = &mt_user($user_lh,'File Handed Back by Instructor'); @@ -3835,29 +3745,14 @@ sub version_portfiles { my $version_parts = join('|',@$v_flag); my @returned_keys; my $parts = join('|', @$parts_graded); - my $portfolio_root = '/userfiles/portfolio'; foreach my $key (keys(%$record)) { my $new_portfiles; if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) { my @versioned_portfiles; my @portfiles = split(/\s*,\s*/,$$record{$key}); - foreach my $file (@portfiles) { - &Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file); - my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/); - my ($answer_name,$answer_ver,$answer_ext) = - &file_name_version_ext($answer_file); - my $getpropath = 1; - my ($dir_list,$listerror) = - &Apache::lonnet::dirlist($portfolio_root.$directory,$domain, - $stu_name,$getpropath); - my $version = &get_next_version($answer_name,$answer_ext,$dir_list); - my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version); - if ($new_answer ne 'problem getting file') { - push(@versioned_portfiles, $directory.$new_answer); - &Apache::lonnet::mark_as_readonly($domain,$stu_name, - [$directory.$new_answer], - [$symb,$env{'request.course.id'},'graded']); - } + if (@portfiles) { + &Apache::lonnet::portfiles_versioning($symb,$domain,$stu_name,\@portfiles, + \@versioned_portfiles); } $$record{$key} = join(',',@versioned_portfiles); push(@returned_keys,$key); @@ -3866,64 +3761,6 @@ sub version_portfiles { return (@returned_keys); } -sub get_next_version { - my ($answer_name, $answer_ext, $dir_list) = @_; - my $version; - if (ref($dir_list) eq 'ARRAY') { - foreach my $row (@{$dir_list}) { - my ($file) = split(/\&/,$row,2); - my ($file_name,$file_version,$file_ext) = - &file_name_version_ext($file); - if (($file_name eq $answer_name) && - ($file_ext eq $answer_ext)) { - # gets here if filename and extension match, - # regardless of version - if ($file_version ne '') { - # a versioned file is found so save it for later - if ($file_version > $version) { - $version = $file_version; - } - } - } - } - } - $version ++; - return($version); -} - -sub version_selected_portfile { - my ($domain,$stu_name,$directory,$file_name,$version) = @_; - my ($answer_name,$answer_ver,$answer_ext) = - &file_name_version_ext($file_name); - my $new_answer; - $env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name"); - if($env{'form.copy'} eq '-1') { - $new_answer = 'problem getting file'; - } else { - $new_answer = $answer_name.'.'.$version.'.'.$answer_ext; - my $copy_result = &Apache::lonnet::finishuserfileupload( - $stu_name,$domain,'copy', - '/portfolio'.$directory.$new_answer); - } - return ($new_answer); -} - -sub file_name_version_ext { - my ($file)=@_; - my @file_parts = split(/\./, $file); - my ($name,$version,$ext); - if (@file_parts > 1) { - $ext=pop(@file_parts); - if (@file_parts > 1 && $file_parts[-1] =~ /^\d+$/) { - $version=pop(@file_parts); - } - $name=join('.',@file_parts); - } else { - $name=join('.',@file_parts); - } - return($name,$version,$ext); -} - #-------------------------------------------------------------------------------------- # #-------------------------- Next few routines handles grading by section or whole class @@ -4140,26 +3977,7 @@ sub viewgrades { } my ($common_header,$specific_header,@sections,$section_display); - if ($env{'request.course.sec'} ne '') { - @sections = ($env{'request.course.sec'}); - } else { - @sections = &Apache::loncommon::get_env_multiple('form.section'); - } - -# Check if Save button should be usable - my $disabled = ' disabled="disabled"'; - if ($perm{'mgr'}) { - if (grep(/^all$/,@sections)) { - undef($disabled); - } else { - foreach my $sec (@sections) { - if (&canmodify($sec)) { - undef($disabled); - last; - } - } - } - } + @sections = &Apache::loncommon::get_env_multiple('form.section'); if (grep(/^all$/,@sections)) { @sections = ('all'); if ($group_display) { @@ -4169,7 +3987,7 @@ sub viewgrades { $common_header = &mt('Assign Common Grade to Students not assigned to any groups'); $specific_header = &mt('Assign Grade to Specific Students not assigned to any groups'); } else { - $common_header = &mt('Assign Common Grade to Class'); + $common_header = &mt('Assign Common Grade to Class'); $specific_header = &mt('Assign Grade to Specific Students in Class'); } } elsif (grep(/^none$/,@sections)) { @@ -4182,7 +4000,7 @@ sub viewgrades { $specific_header = &mt('Assign Grade to Specific Students in no Section and in no Group'); } else { $common_header = &mt('Assign Common Grade to Students in no Section'); - $specific_header = &mt('Assign Grade to Specific Students in no Section'); + $specific_header = &mt('Assign Grade to Specific Students in no Section'); } } else { $section_display = join (", ",@sections); @@ -4196,7 +4014,7 @@ sub viewgrades { $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1] and no Group',$section_display); } else { $common_header = &mt('Assign Common Grade to Students in Section(s) [_1]',$section_display); - $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display); + $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display); } } my %submit_types = &substatus_options(); @@ -4253,10 +4071,10 @@ sub viewgrades { $partid.'" size="4" '.'onchange="javascript:writePoint(\''. $partid.'\','.$weight{$partid}.',\'textval\')" /> /'. $weight{$partid}.' '.&mt('(problem weight)').''."\n"; - $line.= ''.&mt('Grade Status').':'. - ' '. ''. ''. ''. @@ -4315,8 +4133,8 @@ sub viewgrades { my $display_part=&get_display_part($partid,$symb); if ($display =~ /^Partial Credit Factor/) { $result.=''. - &mt('Score Part: [_1][_2](weight = [_3])', - $display_part,'
',$weight{$partid}).''."\n"; + &mt('Score Part: [_1][_2](weight = [_3])', + $display_part,'
',$weight{$partid}).''."\n"; next; } else { @@ -4351,7 +4169,7 @@ sub viewgrades { } $result.=&Apache::loncommon::end_data_table(); $result.=''."\n"; - $result.=''."\n"; if ($ctr == 0) { my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status')); @@ -4364,7 +4182,7 @@ sub viewgrades { $stu_status); } elsif (grep(/^none$/,@groups)) { $result .= &mt('There are no students with no group assigned and with enrollment status [_1] to modify or grade.', - $stu_status); + $stu_status); } else { $result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] to modify or grade.', $group_display,$stu_status); @@ -4417,8 +4235,8 @@ sub viewgrades { } } else { if (grep(/^all$/,@groups)) { - $result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.', - $section_display,$stu_status,$submission_status); + $result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.', + $section_display,$stu_status,$submission_status); } elsif (grep(/^none$/,@groups)) { $result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] and submission status "[_3]" to modify or grade.', $section_display,$stu_status,$submission_status); @@ -4427,13 +4245,13 @@ sub viewgrades { $section_display,$group_display,$stu_status,$submission_status); } } - } + } $result .= '
'; } return $result; } -#--- call by previous routine to display each student who satisfies submission filter. +#--- call by previous routine to display each student who satisfies submission filter. sub viewstudentgrade { my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets,$is_tool) = @_; my ($uname,$udom) = split(/:/,$student); @@ -4614,22 +4432,21 @@ sub editgrades { &Apache::loncommon::end_data_table_header_row(); my @noupdate; my ($updateCtr,$noupdateCtr) = (1,1); - my ($got_types,%queueable); for ($i=0; $i<$env{'form.total'}; $i++) { my $user = $env{'form.ctr'.$i}; my ($uname,$udom)=split(/:/,$user); my %newrecord; my $updateflag = 0; - my $usec=$classlist->{"$uname:$udom"}[5]; - my $canmodify = &canmodify($usec); - my $line = ''. - &nameUserString(undef,$$fullname{$user},$uname,$udom).''; - if (!$canmodify) { - push(@noupdate, - $line."". - &mt('Not allowed to modify student').""); - next; - } + my $usec=$classlist->{"$uname:$udom"}[5]; + my $canmodify = &canmodify($usec); + my $line = ''. + &nameUserString(undef,$$fullname{$user},$uname,$udom).''; + if (!$canmodify) { + push(@noupdate, + $line."". + &mt('Not allowed to modify student').""); + next; + } my %aggregate = (); my $aggregateflag = 0; $user=~s/:/_/; # colon doen't work in javascript for names @@ -4714,32 +4531,12 @@ sub editgrades { $udom,$uname); my $all_graded = 1; my $none_graded = 1; - unless ($got_types) { - my $error; - my ($plist,$handgrd,$resptype) = &response_type($symb,\$error); - unless ($error) { - foreach my $part (@parts) { - if (ref($resptype->{$part}) eq 'HASH') { - foreach my $id (keys(%{$resptype->{$part}})) { - if (($resptype->{$part}->{$id} eq 'essay') || - (lc($handgrd->{$part.'_'.$id}) eq 'yes')) { - $queueable{$part} = 1; - last; - } - } - } - } - } - $got_types = 1; - } foreach my $part (@parts) { - if ($queueable{$part}) { - if ( $record{'resource.'.$part.'.awarded'} eq '' ) { - $all_graded = 0; - } else { - $none_graded = 0; - } - } + if ( $record{'resource.'.$part.'.awarded'} eq '' ) { + $all_graded = 0; + } else { + $none_graded = 0; + } } if ($all_graded || $none_graded) { @@ -4805,7 +4602,7 @@ sub split_part_type { # #--- Javascript to handle csv upload sub csvupload_javascript_reverse_associate { - my $error1=&mt('You need to specify the username or the student/employee ID'); + my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker ID'); my $error2=&mt('You need to specify at least one grading field'); &js_escape(\$error1); &js_escape(\$error2); @@ -4814,13 +4611,15 @@ sub csvupload_javascript_reverse_associa var foundsomething=0; var founduname=0; var foundID=0; + var foundclicker=0; for (i=0;i<=vf.nfields.value;i++) { tw=eval('vf.f'+i+'.selectedIndex'); if (i==0 && tw!=0) { foundID=1; } if (i==1 && tw!=0) { founduname=1; } - if (i!=0 && i!=1 && i!=2 && tw!=0) { foundsomething=1; } + if (i==2 && tw!=0) { foundclicker=1; } + if (i!=0 && i!=1 && i!=2 && i!=3 && tw!=0) { foundsomething=1; } } - if (founduname==0 && foundID==0) { + if (founduname==0 && foundID==0 && foundclicker==0) { alert('$error1'); return; } @@ -4847,7 +4646,7 @@ ENDPICK } sub csvupload_javascript_forward_associate { - my $error1=&mt('You need to specify the username or the student/employee ID'); + my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker ID'); my $error2=&mt('You need to specify at least one grading field'); &js_escape(\$error1); &js_escape(\$error2); @@ -4856,13 +4655,15 @@ sub csvupload_javascript_forward_associa var foundsomething=0; var founduname=0; var foundID=0; + var foundclicker=0; for (i=0;i<=vf.nfields.value;i++) { tw=eval('vf.f'+i+'.selectedIndex'); if (tw==1) { foundID=1; } if (tw==2) { founduname=1; } - if (tw>3) { foundsomething=1; } + if (tw==3) { foundclicker=1; } + if (tw>4) { foundsomething=1; } } - if (founduname==0 && foundID==0) { + if (founduname==0 && foundID==0 && ƒoundclicker==0) { alert('$error1'); return; } @@ -4894,8 +4695,6 @@ sub csvuploadmap_header { $javascript=&csvupload_javascript_forward_associate(); } - my $checked=(($env{'form.noFirstLine'})?' checked="checked"':''); - my $ignore=&mt('Ignore First Line'); $symb = &Apache::lonenc::check_encrypt($symb); $request->print('
'. &mt('Total number of records found in file: [_1]',$distotal).'
'. @@ -4904,7 +4703,6 @@ sub csvuploadmap_header { $request->print(< - @@ -4936,13 +4734,14 @@ sub csvupload_fields { my @fields=(['ID','Student/Employee ID'], ['username','Student Username'], + ['clicker','Clicker ID'], ['domain','Student Domain']); my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); foreach my $part (sort(@parts)) { my @datum; my $display=&Apache::lonnet::metadata($url,$part.'.display',$toolsymb); my $name=$part; - if (!$display) { $display = $name; } + if (!$display) { $display = $name; } @datum=($name,$display); if ($name=~/^stores_(.*)_awarded/) { push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]); @@ -4998,12 +4797,11 @@ sub upcsvScores_form { $upfile_select
- ENDUPFORM $result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV", &mt("How do I create a CSV file from a spreadsheet")). - ''. + ''. &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(); return $result; @@ -5018,13 +4816,12 @@ sub csvuploadmap { if (!$env{'form.datatoken'}) { $datatoken=&Apache::loncommon::upfile_store($request); } else { - $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'}); - if ($datatoken ne '') { + $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'}); + if ($datatoken ne '') { &Apache::loncommon::load_tmp_file($request,$datatoken); } } my @records=&Apache::loncommon::upfile_record_sep(); - if ($env{'form.noFirstLine'}) { shift(@records); } &csvuploadmap_header($request,$symb,$datatoken,$#records+1); my ($i,$keyfields); if (@records) { @@ -5061,8 +4858,6 @@ sub csvuploadmap { sub csvuploadoptions { my ($request,$symb)= @_; my $overwrite=&mt('Overwrite any existing score'); - my $checked=(($env{'form.noFirstLine'})?'1':'0'); - my $ignore=&mt('Ignore First Line'); $request->print(< @@ -5076,7 +4871,7 @@ ENDPICK my %fields=&get_fields(); if (!defined($fields{'domain'})) { my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain'); - $request->print("\n

".&mt('Users are in domain: [_1]',$domform)."

\n"); + $request->print("\n

".&mt('Users are in domain: [_1]',$domform)."

\n"); } foreach my $key (sort(keys(%env))) { if ($key !~ /^form\.(.*)$/) { next; } @@ -5114,11 +4909,10 @@ sub csvuploadassign { if (!$symb) {return '';} my $error_msg = ''; my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'}); - if ($datatoken ne '') { + if ($datatoken ne '') { &Apache::loncommon::load_tmp_file($request,$datatoken); } my @gradedata = &Apache::loncommon::upfile_record_sep(); - if ($env{'form.noFirstLine'}) { shift(@gradedata); } my %fields=&get_fields(); my $courseid=$env{'request.course.id'}; my ($classlist) = &getclasslist('all',0); @@ -5140,13 +4934,45 @@ sub csvuploadassign { if (!$username) { my $id=$entries{$fields{'ID'}}; $id=~s/\s//g; - my %ids=&Apache::lonnet::idget($domain,$id); - $username=$ids{$id}; + if ($id ne '') { + my %ids=&Apache::lonnet::idget($domain,[$id]); + $username=$ids{$id}; + } else { + if ($entries{$fields{'clicker'}}) { + my $clicker = $entries{$fields{'clicker'}}; + $clicker=~s/\s//g; + if ($clicker ne '') { + my %clickers = &Apache::lonnet::idget($domain,[$clicker],'clickers'); + if ($clickers{$clicker} ne '') { + my $match = 0; + my @inclass; + foreach my $poss (split(/,/,$clickers{$clicker})) { + if (exists($$classlist{"$poss:$domain"})) { + $username = $poss; + push(@inclass,$poss); + $match ++; + + } + } + if ($match > 1) { + undef($username); + $request->print('

'. + &mt('Score not saved for clicker: [_1] (matched multiple usernames: [_2])', + $clicker,join(', ',@inclass)).'

'); + } + } + } + } + } } if (!exists($$classlist{"$username:$domain"})) { my $id=$entries{$fields{'ID'}}; $id=~s/\s//g; - if ($id) { + my $clicker = $entries{$fields{'clicker'}}; + $clicker=~s/\s//g; + if ($clicker) { + push(@skipped,"$clicker:$domain"); + } elsif ($id) { push(@skipped,"$id:$domain"); } else { push(@skipped,"$username:$domain"); @@ -5174,7 +5000,7 @@ sub csvuploadassign { my $award=($pcr == 0) ? 'incorrect_by_override' : 'correct_by_override'; if ($pcr>1) { - push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain")); + push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain")); } $grades{"resource.$part.awarded"}=$pcr; $grades{"resource.$part.solved"}=$award; @@ -5210,13 +5036,13 @@ sub csvuploadassign { $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}, $domain,$username); - } else { + $countdone++; + } else { $request->print("

". &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]", "$username:$domain",$result)."

"); } $request->rflush(); - $countdone++; } } $request->print('
'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0)); @@ -5285,30 +5111,30 @@ LISTJAVASCRIPT # Collection of hidden fields my $ctr=0; foreach (@$titles) { - my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); - $result.=''."\n"; - $result.=''."\n"; - $ctr++; + my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); + $result.=''."\n"; + $result.=''."\n"; + $ctr++; } $result.=''."\n". - ''."\n"; + ''."\n"; $result.=&build_section_inputs(); my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); $result.=''."\n". - ''."\n". - ''."\n"; + ''."\n". + ''."\n"; # Show grading options $result.=&Apache::lonhtmlcommon::start_pick_box(); my $select = ''; @@ -5334,7 +5160,7 @@ LISTJAVASCRIPT .'' .&Apache::lonhtmlcommon::row_closure(); - + $result.= &Apache::lonhtmlcommon::row_title(&mt('Use CODE')) .'' @@ -5437,10 +5263,10 @@ sub displayPage { &Apache::lonnet::clear_EXT_cache_status(); if (!&canview($usec)) { - $request->print( + $request->print( ''. &mt('Unable to view requested student. ([_1])', - $env{'form.student'}). + $env{'form.student'}). ''); return; } @@ -5523,7 +5349,7 @@ sub displayPage { } else { if ($env{'form.vProb'} eq 'yes' ) { $studentTable.=&show_problem($request,$symbx,$uname,$udom,1, - undef,'both',\%form); + undef,'both',\%form); } else { my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form); $companswer =~ s|||g; @@ -5534,7 +5360,7 @@ sub displayPage { # } # $companswer =~ s||
|g; $studentTable.=' '.$title.' 
 '.&mt('Correct answer').':
'.$companswer; - } + } } my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); @@ -5558,11 +5384,10 @@ sub displayPage { $responseType{$partid} = \%responseIds; } $studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom); - } } elsif ($env{'form.lastSub'} eq 'all') { my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : ''); - my $identifier = (&canmodify($usec)? $prob : ''); + my $identifier = (&canmodify($usec)? $prob : ''); $studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom, $env{'request.course.id'}, '','.submission',undef, @@ -5584,14 +5409,10 @@ sub displayPage { } $curRes = $iterator->next(); } - my $disabled; - unless (&canmodify($usec)) { - $disabled = ' disabled="disabled"'; - } $studentTable.= '
'."\n". - ''. ''."\n"; $request->print($studentTable); @@ -5621,7 +5442,7 @@ sub displaySubByDates { if ($is_tool) { return '
 '.&mt('No grade passed back.').'
'; } else { - return '
 '.&mt('Nothing submitted - no attempts.').'
'; + return '
 '.&mt('Nothing submitted - no attempts.').'
'; } } @@ -5655,13 +5476,13 @@ sub displaySubByDates { if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) { $hidden = 1; } - my @matchKey; + my @matchKey; if ($isTask) { @matchKey = sort(grep(/^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)); } elsif ($is_tool) { @matchKey = sort(grep(/^resource\.\Q$partid\E\.awarded$/,@versionKeys)); } else { - @matchKey = sort(grep(/^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys)); + @matchKey = sort(grep(/^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys)); } # next if ($$record{"$version:resource.$partid.solved"} eq ''); my $display_part=&get_display_part($partid,$symb); @@ -5672,7 +5493,7 @@ sub displaySubByDates { $displaySub[0].=$$record{"$version:resource.$partid.awarded"}; } else { my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/) - : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); + : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); $displaySub[0].=''; $displaySub[0].=''.&mt('Part: [_1]',$display_part).'' .' ' @@ -5691,8 +5512,8 @@ sub displaySubByDates { $displaySub[0].=&mt('Trial not counted'); } else { $displaySub[0].=&mt('Trial: [_1]', - $$record{"$where.$partid.tries"}); - if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) { + $$record{"$where.$partid.tries"}); + if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) { if (($rndseed ne $lastrndseed{$partid}) && (($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) { $newvariation = ' ('.&mt('New variation this try').')'; @@ -5700,12 +5521,12 @@ sub displaySubByDates { } $lastrndseed{$partid} = $rndseed; $lasttype{$partid} = $type; - } - my $responseType=($isTask ? 'Task' - : $responseType->{$partid}->{$responseId}); - if (!exists($orders{$partid})) { $orders{$partid}={}; } - if ((!exists($orders{$partid}->{$responseId})) || ($trial)) { - $orders{$partid}->{$responseId}= + } + my $responseType=($isTask ? 'Task' + : $responseType->{$partid}->{$responseId}); + if (!exists($orders{$partid})) { $orders{$partid}={}; } + if ((!exists($orders{$partid}->{$responseId})) || ($trial)) { + $orders{$partid}->{$responseId}= &get_order($partid,$responseId,$symb,$uname,$udom, $no_increment,$type,$trial,$rndseed); } @@ -5727,16 +5548,16 @@ sub displaySubByDates { lc($$record{"$where.$partid.award"}).' '. $mark{$$record{"$where.$partid.solved"}}. '
'; - } elsif (($is_tool) && (exists($$record{"$version:resource.$partid.solved"}))) { - if ($$record{"$version:resource.$partid.solved"} =~ /^(in|)correct_by_passback$/) { - $displaySub[1].=&mt('Grade passed back by external tool'); - } + } elsif (($is_tool) && (exists($$record{"$version:resource.$partid.solved"}))) { + if ($$record{"$version:resource.$partid.solved"} =~ /^(in|)correct_by_passback$/) { + $displaySub[1].=&mt('Grade passed back by external tool'); + } } if (exists $$record{"$where.$partid.regrader"}) { $displaySub[2].=$$record{"$where.$partid.regrader"}; - unless ($is_tool) { + unless ($is_tool) { $displaySub[2].=' ('.&mt('Part').': '.$display_part.')'; - } + } } elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) { $displaySub[2].= $$record{"$version:resource.$partid.regrader"}; @@ -5827,7 +5648,6 @@ sub updateGradeByPage { my @displayPts=(); my %aggregate = (); my $aggregateflag = 0; - my %queueable; if ($env{'form.HIDE'.$prob}) { my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); my ($version,$parts) = split(/:/,$env{'form.HIDE'.$prob},2); @@ -5837,20 +5657,7 @@ sub updateGradeByPage { foreach my $partid (@{$parts}) { my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid}; my $oldpts = $env{'form.oldpts'.$question.'_'.$partid}; - my @types = $curRes->responseType($partid); - if (grep(/^essay$/,@types)) { - $queueable{$partid} = 1; - } else { - my @ids = $curRes->responseIds($partid); - for (my $i=0; $i < scalar(@ids); $i++) { - my $hndgrd = &Apache::lonnet::EXT('resource.'.$partid.'_'.$ids[$i]. - '.handgrade',$symb); - if (lc($hndgrd) eq 'yes') { - $queueable{$partid} = 1; - last; - } - } - } + my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ? $env{'form.WGT'.$question.'_'.$partid} : 1; my $partial = $newpts/$wgt; @@ -5916,7 +5723,7 @@ sub updateGradeByPage { $env{'request.course.id'}, $udom,$uname); &check_and_remove_from_queue($parts,\%record,undef,$symbx, - $cdom,$cnum,$udom,$uname,\%queueable); + $cdom,$cnum,$udom,$uname); } if ($aggregateflag) { @@ -6258,30 +6065,31 @@ sub scantron_selectphase { $ssi_error = 0; - if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || - &Apache::lonnet::allowed('usc',$env{'request.course.id'})) { + if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'}) { - # Chunk of form to prompt for a scantron file upload. + # Chunk of form to prompt for a scantron file upload. $r->print('
'); - my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; - my $alertmsg = &mt('Please use the browse button to select a file from your local directory.'); - &js_escape(\$alertmsg); - my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom); - $r->print(&Apache::lonhtmlcommon::scripttag(' + my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; + my $csec= $env{'request.course.sec'}; + my $alertmsg = &mt('Please use the browse button to select a file from your local directory.'); + &js_escape(\$alertmsg); + my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom); + $r->print(&Apache::lonhtmlcommon::scripttag(' function checkUpload(formname) { - if (formname.upfile.value == "") { - alert("'.$alertmsg.'"); - return false; - } - formname.submit(); + if (formname.upfile.value == "") { + alert("'.$alertmsg.'"); + return false; + } + formname.submit(); }'."\n".$formatjs)); - $r->print(' + $r->print('
'.$default_form_data.' + '.&Apache::loncommon::start_data_table('LC_scantron_action').' @@ -6293,8 +6101,8 @@ sub scantron_selectphase { '.&Apache::loncommon::start_data_table_row().' '.&mt('File to upload: [_1]','').'
'."\n"); - if ($formatoptions) { - $r->print(' + if ($formatoptions) { + $r->print(' '.&Apache::loncommon::end_data_table_row().' '.&Apache::loncommon::start_data_table_row().' '.$formattitle.(' 'x2).$formatoptions.' @@ -6302,16 +6110,16 @@ sub scantron_selectphase { '.&Apache::loncommon::end_data_table_row().' '.&Apache::loncommon::start_data_table_row().' ' - ); - } else { - $r->print('
'); - } - $r->print(' + ); + } else { + $r->print('
'); + } + $r->print(' '.&Apache::loncommon::end_data_table_row().' '.&Apache::loncommon::end_data_table().'
' - ); + ); } @@ -6428,7 +6236,9 @@ sub scantron_selectphase { =item username_to_idmap creates a hash keyed by student/employee ID with values of the corresponding - student username:domain. + student username:domain. If a single ID occurs for more than one student, + the status of the student is checked, and if Active, the value in the hash + will be set to the Active student. Arguments: @@ -6628,12 +6438,12 @@ sub digits_to_letters { =item scantron_parse_scanline - Decodes a scanline from the selected scantron file + Decodes a scanline from the selected bubblesheet file Arguments: - line - The text of the scantron file line to process + line - The text of the bubblesheet file line to process whichline - Line number - scantron_config - Hash describing the format of the scantron lines. + scantron_config - Hash describing the format of the bubblesheet lines. scan_data - Hash of extra information about the scanline (see scantron_getfile for more information) just_header - True if should not process question answers but only @@ -6658,7 +6468,7 @@ sub digits_to_letters { totalref - Ref of scalar used to score total number of bubble lines needed for responses in a scan line (used when randompick in use. - + Returns: Hash containing the result of parsing the scanline @@ -6751,7 +6561,7 @@ sub scantron_parse_scanline { $partids_by_symb,$orderedforcode, $respnumlookup,$startline); if ($total) { - $lastpos = $total*$$scantron_config{'Qlength'}; + $lastpos = $total*$$scantron_config{'Qlength'}; } if (ref($totalref)) { $$totalref = $total; @@ -6765,7 +6575,7 @@ sub scantron_parse_scanline { if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) { $answers_needed = $bubble_lines_per_response{$respnumlookup->{$questnum}}; } else { - $answers_needed = $bubble_lines_per_response{$questnum}; + $answers_needed = $bubble_lines_per_response{$questnum}; } my $answer_length = ($$scantron_config{'Qlength'} * $answers_needed) || 1; @@ -6825,12 +6635,9 @@ sub scantron_parse_scanline { } sub get_master_seq { - my ($resources,$master_seq,$symb_to_resource,$need_symb_in_map,$symb_for_examcode) = @_; - return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') && + my ($resources,$master_seq,$symb_to_resource) = @_; + return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') && (ref($symb_to_resource) eq 'HASH')); - if ($need_symb_in_map) { - return unless (ref($symb_for_examcode) eq 'HASH'); - } my $resource_error; foreach my $resource (@{$resources}) { my $ressymb; @@ -6838,14 +6645,6 @@ sub get_master_seq { $ressymb = $resource->symb(); push(@{$master_seq},$ressymb); $symb_to_resource->{$ressymb} = $resource; - if ($need_symb_in_map) { - unless ($resource->is_map()) { - my $map=(&Apache::lonnet::decode_symb($ressymb))[0]; - unless (exists($symb_for_examcode->{$map})) { - $symb_for_examcode->{$map} = $ressymb; - } - } - } } else { $resource_error = 1; last; @@ -6915,7 +6714,7 @@ sub scantron_validator_lettnum { my $occurrences = 0; my $responsenum = $questnum-1; if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) { - $responsenum = $respnumlookup->{$questnum-1} + $responsenum = $respnumlookup->{$questnum-1} } if (($responsetype_per_response{$responsenum} eq 'essayresponse') || ($responsetype_per_response{$responsenum} eq 'formularesponse') || @@ -7211,7 +7010,7 @@ sub scantron_process_corrections { } } if ($err) { - $r->print( + $r->print( '

' .&mt('Unable to accept last correction, an error occurred: [_1]', $errmsg) @@ -7348,7 +7147,7 @@ sub scantron_warning_screen { ''.&mt('Hand-graded items: points from last bubble in row').''. $env{'form.scantron_lastbubblepoints'}.''; } - return (' + return '

'.&mt("Please double check the information below before clicking on '[_1]'",&mt($button_text)).' @@ -7360,9 +7159,7 @@ sub scantron_warning_screen {

'.&mt("If this information is correct, please click on '[_1]'.",&mt($button_text)).'
'.&mt('If something is incorrect, please return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','','').'

- -
-'); +'; } =pod @@ -7388,15 +7185,58 @@ sub scantron_do_warning { } if ( $env{'form.scantron_selectfile'} eq '') { $r->print('

'.&mt("You have not selected a file that contains the student's response data.").'

'); - } + } if ( $env{'form.scantron_format'} eq '') { $r->print('

'.&mt("You have not selected the format of the student's response data.").'

'); - } + } } else { my $warning=&scantron_warning_screen('Grading: Validate Records',$symb); + my ($checksec,@possibles) = &gradable_sections(); + my $gradesections; + if ($checksec) { + my $file=$env{'form.scantron_selectfile'}; + if (&valid_file($file)) { + my %bysec = &scantron_get_sections(); + my $table; + if ((keys(%bysec) > 1) || ((keys(%bysec) == 1) && ((keys(%bysec))[0] ne $checksec))) { + $gradesections = &mt('Your current role is for section [_1].',''.$checksec.'').'
'; + $table = &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('Section').''.&mt('Number of records').''. + &Apache::loncommon::end_data_table_header_row()."\n"; + if ($bysec{'none'}) { + $table .= &Apache::loncommon::start_data_table_row(). + ''.&mt('None').''.$bysec{'none'}.''. + &Apache::loncommon::end_data_table_row()."\n"; + } + foreach my $sec (sort { $a <=> $b } keys(%bysec)) { + next if ($sec eq 'none'); + $table .= &Apache::loncommon::start_data_table_row(). + ''.$sec.''.$bysec{$sec}.''. + &Apache::loncommon::end_data_table_row()."\n"; + } + $table .= &Apache::loncommon::end_data_table()."\n"; + $gradesections .= &mt('Sections represented in the bubblesheet data file (based on bubbled student IDs) are as follows:'). + '

'.$table.'

'; + if (@possibles) { + $gradesections .= '

'. + &mt('You have role(s) in [quant,_1,other section,other sections] with privileges to manage grades.', + scalar(@possibles)).'
'. + &mt('Check which of those section(s), in addition to section [_1], you wish to grade using this bubblesheet file:', + ''.$checksec.'').' '; + foreach my $sec (sort {$a <=> $b } @possibles) { + $gradesections .= ''.(' 'x2); + } + $gradesections .= '

'; + } + } + } else { + $gradesections = '

'.&mt('The selected file is unavailable').'

'; + } + } my $bubbledbyhand=&hand_bubble_option(); $r->print(' -'.$warning.$bubbledbyhand.' +'.$warning.$gradesections.$bubbledbyhand.' '); @@ -7483,7 +7323,38 @@ sub scantron_validate_file { if ($env{'form.scantron_corrections'}) { &scantron_process_corrections($r); } - $r->print('

'.&mt('Gathering necessary information.').'

');$r->rflush(); + + $r->print('

'.&mt('Gathering necessary information.').'

'); + my ($checksec,@gradable); + if ($env{'request.course.sec'}) { + ($checksec,my @possibles) = &gradable_sections(); + if ($checksec) { + if (@possibles) { + my @chosensecs = &Apache::loncommon::get_env_multiple('form.scantron_othersections'); + if (@chosensecs) { + foreach my $sec (@chosensecs) { + if (grep(/^\Q$sec\E$/,@possibles)) { + unless (grep(/^\Q$sec\E$/,@gradable)) { + push(@gradable,$sec); + } + } + } + } + } + $r->print('

'); + if (@gradable) { + my @showsections = sort { $a <=> $b } (@gradable,$checksec); + $r->print( + ''); + } else { + $r->print( + ''); + } + $r->print('
'.&mt('Sections to be Graded:').''.join(', ',@showsections).'
'.&mt('Section to be Graded:').''.$checksec.'

'); + } + } + $r->rflush(); + #get the student pick code ready $r->print(&Apache::loncommon::studentbrowser_javascript()); my $nav_error; @@ -7508,23 +7379,39 @@ sub scantron_validate_file { $env{'form.validatepass'} = 0; } my $currentphase=$env{'form.validatepass'}; - + my %skipbysec=(); my $stop=0; while (!$stop && $currentphase < scalar(@validate_phases)) { $r->print(&mt('Validating '.$validate_phases[$currentphase]).'
'); $r->rflush(); - + my $which="scantron_validate_".$validate_phases[$currentphase]; { no strict 'refs'; - ($stop,$currentphase)=&$which($r,$currentphase); + my @extras=(); + if ($validate_phases[$currentphase] eq 'ID') { + @extras = (\%skipbysec,$checksec,@gradable); + } + ($stop,$currentphase)=&$which($r,$currentphase,@extras); } } if (!$stop) { my $warning=&scantron_warning_screen('Start Grading',$symb); + my $secinfo; + if (keys(%skipbysec) > 0) { + my $seclist = '
    '; + foreach my $sec (sort { $a <=> $b } keys(%skipbysec)) { + $seclist .= '
  • '.&mt('section [_1]: [_2]',$sec,$skipbysec{$sec}).'
    • '; + } + $seclist .= '
'; + $secinfo = '

'. + &mt('Numbers of records for students in sections not being graded [_1]', + $seclist). + '

'; + } $r->print(&mt('Validation process complete.').'
'. - $warning. + $secinfo.$warning. &mt('Perform verification for each student after storage of submissions?'). ' '. @@ -7544,7 +7431,7 @@ sub scantron_validate_file { $r->print(''); $r->print(' '.&mt('this error').'
'); - $r->print('

'.&mt('Or return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','','').'

'); + $r->print('

'.&mt('Or return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','','').'

'); } else { if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') { $r->print(''); @@ -7923,9 +7810,10 @@ sub scantron_validate_sequence { my @resources= $navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0); if (@resources) { - $r->print('

' + $r->print( + '

' .&mt('Some resources in the sequence currently are not set to' - .' exam mode. Grading these resources currently may not' + .' bubblesheet exam mode. Grading these resources currently may not' .' work correctly.') .'

' ); @@ -7939,11 +7827,12 @@ sub scantron_validate_sequence { sub scantron_validate_ID { - my ($r,$currentphase) = @_; + my ($r,$currentphase,$skipbysec,$checksec,@gradable) = @_; #get student info my $classlist=&Apache::loncoursedata::get_classlist(); my %idmap=&username_to_idmap($classlist); + my $secidx = &Apache::loncoursedata::CL_SECTION(); #get scantron line setup my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); @@ -7957,6 +7846,7 @@ sub scantron_validate_ID { } my %found=('ids'=>{},'usernames'=>{}); + my $unsavedskips = 0; for (my $i=0;$i<=$scanlines->{'count'};$i++) { my $line=&scantron_get_line($scanlines,$scan_data,$i); if ($line=~/^[\s\cz]*$/) { next; } @@ -7969,13 +7859,41 @@ sub scantron_validate_ID { } if ($found) { my $username=$idmap{$found}; + if ($checksec) { + if (ref($classlist->{$username}) eq 'ARRAY') { + my $stusec = $classlist->{$username}->[$secidx]; + if ($stusec ne $checksec) { + unless ((@gradable > 0) && (grep(/^\Q$stusec\E$/,@gradable))) { + my $skip=1; + &scantron_put_line($scanlines,$scan_data,$i,$line,$skip); + if (ref($skipbysec) eq 'HASH') { + if ($stusec eq '') { + $skipbysec->{'none'} ++; + } else { + $skipbysec->{$stusec} ++; + } + } + $unsavedskips ++; + next; + } + } + } + } if ($found{'ids'}{$found}) { &scantron_get_correction($r,$i,$scan_record,\%scantron_config, $line,'duplicateID',$found); + if ($unsavedskips) { + &scantron_putfile($scanlines,$scan_data); + $unsavedskips = 0; + } return(1,$currentphase); } elsif ($found{'usernames'}{$username}) { &scantron_get_correction($r,$i,$scan_record,\%scantron_config, $line,'duplicateID',$username); + if ($unsavedskips) { + &scantron_putfile($scanlines,$scan_data); + $unsavedskips = 0; + } return(1,$currentphase); } #FIXME store away line we previously saw the ID on to use above @@ -7984,29 +7902,95 @@ sub scantron_validate_ID { } else { if ($id =~ /^\s*$/) { my $username=&scan_data($scan_data,"$i.user"); - if (defined($username) && $found{'usernames'}{$username}) { + if (($checksec && $username ne '')) { + if (ref($classlist->{$username}) eq 'ARRAY') { + my $stusec = $classlist->{$username}->[$secidx]; + if ($stusec ne $checksec) { + unless ((@gradable > 0) && (grep(/^\Q$stusec\E$/,@gradable))) { + my $skip=1; + &scantron_put_line($scanlines,$scan_data,$i,$line,$skip); + if (ref($skipbysec) eq 'HASH') { + if ($stusec eq '') { + $skipbysec->{'none'} ++; + } else { + $skipbysec->{$stusec} ++; + } + } + $unsavedskips ++; + next; + } + } + } + } elsif (defined($username) && $found{'usernames'}{$username}) { &scantron_get_correction($r,$i,$scan_record, \%scantron_config, $line,'duplicateID',$username); + if ($unsavedskips) { + &scantron_putfile($scanlines,$scan_data); + $unsavedskips = 0; + } return(1,$currentphase); } elsif (!defined($username)) { &scantron_get_correction($r,$i,$scan_record, \%scantron_config, $line,'incorrectID'); + if ($unsavedskips) { + &scantron_putfile($scanlines,$scan_data); + $unsavedskips = 0; + } return(1,$currentphase); } $found{'usernames'}{$username}++; } else { &scantron_get_correction($r,$i,$scan_record,\%scantron_config, $line,'incorrectID'); + if ($unsavedskips) { + &scantron_putfile($scanlines,$scan_data); + $unsavedskips = 0; + } return(1,$currentphase); } } } - + if ($unsavedskips) { + &scantron_putfile($scanlines,$scan_data); + $unsavedskips = 0; + } return (0,$currentphase+1); } +sub scantron_get_sections { + my %bysec; + if ($env{'form.scantron_format'} ne '') { + my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); + my ($scanlines,$scan_data)=&scantron_getfile(); + my $classlist=&Apache::loncoursedata::get_classlist(); + my %idmap=&username_to_idmap($classlist); + foreach my $key (keys(%idmap)) { + my $lckey = lc($key); + $idmap{$lckey} = $idmap{$key}; + } + my $secidx = &Apache::loncoursedata::CL_SECTION(); + for (my $i=0;$i<=$scanlines->{'count'};$i++) { + my $line=&scantron_get_line($scanlines,$scan_data,$i); + if ($line=~/^[\s\cz]*$/) { next; } + my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, + $scan_data); + my $id=lc($$scan_record{'scantron.ID'}); + if (exists($idmap{$id})) { + if (ref($classlist->{$idmap{$id}}) eq 'ARRAY') { + my $stusec = $classlist->{$idmap{$id}}->[$secidx]; + if ($stusec eq '') { + $bysec{'none'} ++; + } else { + $bysec{$stusec} ++; + } + } + } + } + } + return %bysec; +} sub scantron_get_correction { my ($r,$i,$scan_record,$scan_config,$line,$error,$arg, @@ -8047,10 +8031,10 @@ sub scantron_get_correction { if ($error =~ /ID$/) { if ($error eq 'incorrectID') { - $r->print('

'.&mt("The encoded ID is not in the classlist"). + $r->print('

'.&mt("The encoded ID is not in the classlist"). "

\n"); } elsif ($error eq 'duplicateID') { - $r->print('

'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."

\n"); + $r->print('

'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."

\n"); } $r->print($message); $r->print("

".&mt("How should I handle this?")."
\n"); @@ -8070,8 +8054,8 @@ sub scantron_get_correction { } elsif ($error eq 'duplicateCODE') { $r->print('

'.&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."

\n"); } - $r->print("

".&mt('The CODE on the form is [_1]', - "'$$scan_record{'scantron.CODE'}'") + $r->print("

".&mt('The CODE on the form is [_1]', + "'$$scan_record{'scantron.CODE'}'") ."

\n"); $r->print($message); $r->print("

".&mt("How should I handle this?")."

\n"); @@ -8168,7 +8152,7 @@ ENDSCRIPT # The form field scantron_questions is actually a list of line numbers not # a list of question numbers. Therefore: # - + my $line_list = &questions_to_line_list($arg,$randomorder,$randompick, $respnumlookup,$startline); @@ -8278,7 +8262,7 @@ sub questions_to_line_list { } else { $first = $first_bubble_line{$responsenum} + 1; } - $count = $bubble_lines_per_response{$responsenum}; + $count = $bubble_lines_per_response{$responsenum}; } $last = $first+$count-1; push(@lines, ($first..$last)); @@ -8309,6 +8293,7 @@ for multi and missing bubble cases). and value is number of first bubble line for current student or code-based randompick and/or randomorder. + Implicit inputs: %bubble_lines_per_response - Starting line numbers for each question. Numbered from 0 (but question numbers are from @@ -8361,7 +8346,7 @@ sub prompt_for_corrections { } else { if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) { $responsenum = $respnumlookup->{$question-1}; - if (ref($startline) eq 'HASH') { + if (ref($startline) eq 'HASH') { $first = $startline->{$question-1}; } } else { @@ -8379,7 +8364,16 @@ sub prompt_for_corrections { ($responsetype_per_response{$responsenum} eq 'imageresponse') || ($responsetype_per_response{$responsenum} eq 'reactionresponse') || ($responsetype_per_response{$responsenum} eq 'organicresponse')) { - $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the bubblesheet exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines).'

'.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.').'
'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'
'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'

'); + $r->print( + &mt("Although this particular question type requires handgrading, the instructions for this question in the bubblesheet exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines) + .'

' + .&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.') + .'
' + .&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.') + .'
' + .&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.") + .'

' + ); } else { $r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."
"); } @@ -8419,7 +8413,7 @@ sub scantron_bubble_selector { my $max=$$scan_config{'Qlength'}; my $scmode=$$scan_config{'Qon'}; - if ($scmode eq 'number' || $scmode eq 'letter') { + if ($scmode eq 'number' || $scmode eq 'letter') { if (($$scan_config{'BubblesPerRow'} =~ /^\d+$/) && ($$scan_config{'BubblesPerRow'} > 0)) { $max=$$scan_config{'BubblesPerRow'}; @@ -8662,17 +8656,6 @@ sub scantron_validate_doublebubble { if (ref($map)) { $randomorder = $map->randomorder(); $randompick = $map->randompick(); - unless ($randomorder || $randompick) { - foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) { - if ($res->randomorder()) { - $randomorder = 1; - } - if ($res->randompick()) { - $randompick = 1; - } - last if ($randomorder || $randompick); - } - } if ($randomorder || $randompick) { $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); if ($nav_error) { @@ -8749,7 +8732,7 @@ sub scantron_get_maxbubble { my $response_number = 0; my $bubble_line = 0; foreach my $resource (@resources) { - my $resid = $resource->id(); + my $resid = $resource->id(); my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname, $udom,undef,$bubbles_per_row); if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { @@ -8800,7 +8783,7 @@ sub scantron_get_maxbubble { $bubble_lines_per_response{$response_number} = $lines; $responsetype_per_response{$response_number} = $analysis->{$part_id.'.type'}; - $masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number; + $masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number; $response_number++; $bubble_line += $lines; @@ -8856,17 +8839,6 @@ sub scantron_validate_missingbubbles { if (ref($map)) { $randomorder = $map->randomorder(); $randompick = $map->randompick(); - unless ($randomorder || $randompick) { - foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) { - if ($res->randomorder()) { - $randomorder = 1; - } - if ($res->randompick()) { - $randompick = 1; - } - last if ($randomorder || $randompick); - } - } if ($randomorder || $randompick) { $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); if ($nav_error) { @@ -8892,9 +8864,9 @@ sub scantron_validate_missingbubbles { for (my $i=0;$i<=$scanlines->{'count'};$i++) { my $line=&scantron_get_line($scanlines,$scan_data,$i); if ($line=~/^[\s\cz]*$/) { next; } - my $scan_record = + my $scan_record = &scantron_parse_scanline($line,$i,\%scantron_config,$scan_data,undef,\%idmap, - $randomorder,$randompick,$sequence,\@master_seq, + $randomorder,$randompick,$sequence,\@master_seq, \%symb_to_resource,\%grader_partids_by_symb, \%orderedforcode,\%respnumlookup,\%startline); if (!defined($$scan_record{'scantron.missingerror'})) { next; } @@ -8905,36 +8877,36 @@ sub scantron_validate_missingbubbles { foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) { my $lastbubble; if ($missing =~ /^(\d+)\.(\d+)$/) { - my $question = $1; - my $subquestion = $2; - my ($first,$responsenum); - if ($randomorder || $randompick) { - $responsenum = $respnumlookup{$question-1}; - $first = $startline{$question-1}; - } else { - $responsenum = $question-1; - $first = $first_bubble_line{$responsenum}; - } - if (!defined($first)) { next; } - my @subans = split(/,/,$subdivided_bubble_lines{$responsenum}); - my $subcount = 1; - while ($subcount<$subquestion) { - $first += $subans[$subcount-1]; - $subcount ++; - } - my $count = $subans[$subquestion-1]; - $lastbubble = $first + $count; + my $question = $1; + my $subquestion = $2; + my ($first,$responsenum); + if ($randomorder || $randompick) { + $responsenum = $respnumlookup{$question-1}; + $first = $startline{$question-1}; + } else { + $responsenum = $question-1; + $first = $first_bubble_line{$responsenum}; + } + if (!defined($first)) { next; } + my @subans = split(/,/,$subdivided_bubble_lines{$responsenum}); + my $subcount = 1; + while ($subcount<$subquestion) { + $first += $subans[$subcount-1]; + $subcount ++; + } + my $count = $subans[$subquestion-1]; + $lastbubble = $first + $count; } else { - my ($first,$responsenum); - if ($randomorder || $randompick) { - $responsenum = $respnumlookup{$missing-1}; - $first = $startline{$missing-1}; - } else { - $responsenum = $missing-1; - $first = $first_bubble_line{$responsenum}; - } - if (!defined($first)) { next; } - $lastbubble = $first + $bubble_lines_per_response{$responsenum}; + my ($first,$responsenum); + if ($randomorder || $randompick) { + $responsenum = $respnumlookup{$missing-1}; + $first = $startline{$missing-1}; + } else { + $responsenum = $missing-1; + $first = $first_bubble_line{$responsenum}; + } + if (!defined($first)) { next; } + $lastbubble = $first + $bubble_lines_per_response{$responsenum}; } if ($lastbubble > $max_bubble) { next; } push(@to_correct,$missing); @@ -8997,7 +8969,7 @@ sub scantron_process_students { my $default_form_data=&defaultFormData($symb); my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); - my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); + my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); my ($scanlines,$scan_data)=&scantron_getfile(); my $classlist=&Apache::loncoursedata::get_classlist(); my %idmap=&username_to_idmap($classlist); @@ -9008,21 +8980,10 @@ sub scantron_process_students { } my $map=$navmap->getResourceByUrl($sequence); my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb, - %grader_randomlists_by_symb,%symb_for_examcode); + %grader_randomlists_by_symb); if (ref($map)) { $randomorder = $map->randomorder(); $randompick = $map->randompick(); - unless ($randomorder || $randompick) { - foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) { - if ($res->randomorder()) { - $randomorder = 1; - } - if ($res->randompick()) { - $randompick = 1; - } - last if ($randomorder || $randompick); - } - } } else { $r->print(&navmap_errormsg()); return ''; @@ -9030,7 +8991,7 @@ sub scantron_process_students { my $nav_error; my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); if ($randomorder || $randompick) { - $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource,1,\%symb_for_examcode); + $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); if ($nav_error) { $r->print(&navmap_errormsg()); return ''; @@ -9047,9 +9008,10 @@ sub scantron_process_students { SCANTRONFORM $r->print($result); + my ($checksec,@possibles)=&gradable_sections(); my @delayqueue; my (%completedstudents,%scandata); - + my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam')); my $count=&get_todo_count($scanlines,$scan_data); my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count); @@ -9092,7 +9054,7 @@ SCANTRONFORM my %startline = (); my $total; my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, - $scan_data,undef,\%idmap,$randomorder, + $scan_data,undef,\%idmap,$randomorder, $randompick,$sequence,\@master_seq, \%symb_to_resource,\%grader_partids_by_symb, \%orderedforcode,\%respnumlookup,\%startline, @@ -9109,6 +9071,13 @@ SCANTRONFORM next; } my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION]; + if (($checksec ne '') && ($checksec ne $usec)) { + unless (grep(/^\Q$usec\E$/,@possibles)) { + &scantron_add_delay(\@delayqueue,$line, + "No role with manage grades privilege in student's section ($usec)",3); + next; + } + } my $user = $uname.':'.$usec; ($uname,$udom)=split(/:/,$uname); @@ -9122,7 +9091,7 @@ SCANTRONFORM my @mapresources = @resources; if ($randomorder || $randompick) { - @mapresources = + @mapresources = &users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource, \%orderedforcode); } @@ -9177,16 +9146,11 @@ SCANTRONFORM } if (($scancode) && ($randomorder || $randompick)) { - foreach my $key (keys(%symb_for_examcode)) { - my $symb_in_map = $symb_for_examcode{$key}; - if ($symb_in_map ne '') { - my $parmresult = - &Apache::lonparmset::storeparm_by_symb($symb_in_map, - '0_examcode',2,$scancode, - 'string_examcode',$uname, - $udom); - } - } + my $parmresult = + &Apache::lonparmset::storeparm_by_symb($symb, + '0_examcode',2,$scancode, + 'string_examcode',$uname, + $udom); } $completedstudents{$uname}={'line'=>$line}; if ($env{'form.verifyrecord'}) { @@ -9216,7 +9180,7 @@ SCANTRONFORM if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode, \@mapresources,\%partids_by_symb, $bubbles_per_row,$randomorder,$randompick, - \%respnumlookup,\%startline) + \%respnumlookup,\%startline) eq 'ssi_error') { $ssi_error = 0; # So end of handler error message does not trigger. $r->print(""); @@ -9309,7 +9273,7 @@ sub graders_resources_pass { =item users_order Returns array of resources in current map, ordered based on either CODE, - if this is a CODEd exam, or based on student's identity if this is a + if this is a CODEd exam, or based on student's identity if this is a "NAMEd" exam. Should be used when randomorder and/or randompick applied when the @@ -9336,7 +9300,7 @@ sub users_order { if (ref($actual_seq) eq 'ARRAY') { @mapresources = map { $symb_to_resource->{$_}; } @{$actual_seq}; if (ref($orderedforcode) eq 'HASH') { - if (@mapresources > 0) { + if (@mapresources > 0) { $orderedforcode->{$scancode} = \@mapresources; } } @@ -9349,7 +9313,7 @@ sub users_order { $master_seq, $user,undef,1); if (ref($actual_seq) eq 'ARRAY') { - @mapresources = + @mapresources = map { $symb_to_resource->{$_}; } @{$actual_seq}; } } @@ -9414,7 +9378,7 @@ sub scantron_upload_scantron_data { 'domainid', 'coursename',$dom); my $syllabuslink = ''.&mt('Syllabus').''. - (' 'x2).&mt('(shows course personnel)'); + (' 'x2).&mt('(shows course personnel)'); my $default_form_data=&defaultFormData($symb); my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.'); &js_escape(\$nofile_alert); @@ -9495,13 +9459,13 @@ END if (keys(%{$domconfig{'scantron'}{'config'}}) > 1) { if (($domconfig{'scantron'}{'config'}{'dat'}) && (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH')) { - if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { + if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) { my ($onclick,$formatextra,$singleline); my @lines = &Apache::lonnet::get_scantronformat_file(); my $count = 0; foreach my $line (@lines) { - next if (($line =~ /^\#/) || ($line eq '')); + next if ($line =~ /^#/); $singleline = $line; $count ++; } @@ -9569,16 +9533,18 @@ sub scantron_upload_scantron_data_save { ''."\n"; if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) && !&Apache::lonnet::allowed('usc', - $env{'form.domainid'}.'_'.$env{'form.courseid'})) { + $env{'form.domainid'}.'_'.$env{'form.courseid'}) && + !&Apache::lonnet::allowed('usc', + $env{'form.domainid'}.'_'.$env{'form.courseid'}.'/'.$env{'form.coursesec'})) { $r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."
"); - unless ($symb) { + unless ($symb) { $r->print($doanotherupload); } return ''; } my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'}); my $uploadedfile; - $r->print('

'.&mt("Uploading file to [_1]",$coursedata{'description'}).'

'); + $r->print('

'.&mt('Uploading file to [_1]','"'.$coursedata{'description'}.'"').'

'); if (length($env{'form.upfile'}) < 2) { $r->print( &Apache::lonhtmlcommon::confirm_success( @@ -9618,16 +9584,25 @@ sub scantron_upload_scantron_data_save { my $result = &Apache::lonnet::userfileupload('upfile','scantron','scantron',$parser,'','', $env{'form.courseid'},$env{'form.domainid'}); - if ($result =~ m{^/uploaded/}) { + if ($result =~ m{^/uploaded/}) { $r->print( &Apache::lonhtmlcommon::confirm_success(&mt('Upload successful')).'
'. &mt('Uploaded [_1] bytes of data into location: [_2]', (length($env{'form.upfile'})-1), ''.$result.'')); ($uploadedfile) = ($result =~ m{/([^/]+)$}); + if ($uploadedfile =~ /^scantron_orig_/) { + my $logname = $uploadedfile; + $logname =~ s/^scantron_orig_//; + if ($logname ne '') { + my $now = time; + my %info = ($logname => { $now => $env{'user.name'}.':'.$env{'user.domain'} }); + &Apache::lonnet::put('scantronupload',\%info,$env{'form.domainid'},$env{'form.courseid'}); + } + } $r->print(&validate_uploaded_scantron_file($env{'form.domainid'}, - $env{'form.courseid'},$uploadedfile)); - } else { + $env{'form.courseid'},$symb,$uploadedfile)); + } else { $r->print( &Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'
'. &mt('An error ([_1]) occurred when attempting to upload the file: [_2]', @@ -9644,13 +9619,34 @@ sub scantron_upload_scantron_data_save { } sub validate_uploaded_scantron_file { - my ($cdom,$cname,$fname) = @_; + my ($cdom,$cname,$symb,$fname,$context,$countsref) = @_; + my $scanlines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.$fname); my @lines; if ($scanlines ne '-1') { @lines=split("\n",$scanlines,-1); } - my $output; + my ($output,$secidx,$checksec,$priv,%crsroleshash,@possibles); + $secidx = &Apache::loncoursedata::CL_SECTION(); + if ($context eq 'download') { + $priv = 'mgr'; + } else { + $priv = 'usc'; + } + unless ((&Apache::lonnet::allowed($priv,$env{'request.role.domain'})) || + (($env{'request.course.id'}) && + (&Apache::lonnet::allowed($priv,$env{'request.course.id'})))) { + if ($env{'request.course.sec'} ne '') { + unless (&Apache::lonnet::allowed($priv, + "$env{'request.course.id'}/$env{'request.course.sec'}")) { + unless ($context eq 'download') { + $output = '

'.&mt('You do not have permission to upload bubblesheet data').'

'; + } + return $output; + } + ($checksec,@possibles)=&gradable_sections(); + } + } if (@lines) { my (%counts,$max_match_format); my ($found_match_count,$max_match_count,$max_match_pct) = (0,0,0); @@ -9663,7 +9659,7 @@ sub validate_uploaded_scantron_file { my %unique_formats; my @formatlines = &Apache::lonnet::get_scantronformat_file(); foreach my $line (@formatlines) { - next if (($line =~ /^\#/) || ($line eq '')); + chomp($line); my @config = split(/:/,$line); my $idstart = $config[5]; my $idlength = $config[6]; @@ -9680,6 +9676,8 @@ sub validate_uploaded_scantron_file { %{$counts{$key}} = ( 'found' => 0, 'total' => 0, + 'totalanysec' => 0, + 'othersec' => 0, ); foreach my $line (@lines) { next if ($line =~ /^#/); @@ -9687,6 +9685,23 @@ sub validate_uploaded_scantron_file { my $id = substr($line,$idstart-1,$idlength); $id = lc($id); if (exists($idmap{$id})) { + if ($checksec ne '') { + $counts{$key}{'totalanysec'} ++; + if (ref($classlist->{$idmap{$id}}) eq 'ARRAY') { + my $stusec = $classlist->{$idmap{$id}}->[$secidx]; + if ($stusec ne $checksec) { + if (@possibles) { + unless (grep(/^\Q$stusec\E$/,@possibles)) { + $counts{$key}{'othersec'} ++; + next; + } + } else { + $counts{$key}{'othersec'} ++; + next; + } + } + } + } $counts{$key}{'found'} ++; } $counts{$key}{'total'} ++; @@ -9701,7 +9716,7 @@ sub validate_uploaded_scantron_file { } } } - if (ref($unique_formats{$max_match_format}) eq 'ARRAY') { + if ((ref($unique_formats{$max_match_format}) eq 'ARRAY') && ($context ne 'download')) { my $format_descs; my $numwithformat = @{$unique_formats{$max_match_format}}; for (my $i=0; $i<$numwithformat; $i++) { @@ -9746,13 +9761,179 @@ sub validate_uploaded_scantron_file { '
  • '.&mt('The course roster is not up to date.').'
    • '. ''; } + if (($checksec ne '') && (ref($counts{$max_match_format}) eq 'HASH')) { + if ($counts{$max_match_format}{'othersec'}) { + my $percent_nongrade = (100*$counts{$max_match_format}{'othersec'})/($counts{$max_match_format}{'totalanysec'}); + my $showpct = sprintf("%.0f",$percent_nongrade).'%'; + my $confirmdel = &mt('Are you sure you want to permanently delete this file?'); + &js_escape(\$confirmdel); + $output .= '

    '. + &mt('Comparison of student IDs in the uploaded file with the course roster found [_1][quant,_2,match,matches][_3] for students in section(s) for which none of your role(s) have privileges to modify grades', + '',$counts{$max_match_format}{'othersec'},''). + '
    '. + &mt('Unless you are assigned role(s) which allow modification of grades in additional sections, [_1] of the records in this file will be automatically excluded when you perform bubblesheet grading.',''.$showpct.''). + '

    '. + &mt('If you prefer to delete the file now, use: [_1]'). + '

    '. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + '

    '; + } + } } - } else { + if (($context eq 'download') && ($checksec ne '')) { + if ((ref($countsref) eq 'HASH') && (ref($counts{$max_match_format}) eq 'HASH')) { + $countsref->{'totalanysec'} = $counts{$max_match_format}{'totalanysec'}; + $countsref->{'othersec'} = $counts{$max_match_format}{'othersec'}; + } + } + } elsif ($context ne 'download') { $output = '

    '.&mt('Uploaded file contained no data').'

    '; } return $output; } +sub gradable_sections { + my $checksec = $env{'request.course.sec'}; + my @oksecs; + if ($checksec) { + my %availablesecs = §ions_grade_privs(); + if (ref($availablesecs{'mgr'}) eq 'ARRAY') { + foreach my $sec (@{$availablesecs{'mgr'}}) { + unless (grep(/^\Q$sec\E$/,@oksecs)) { + push(@oksecs,$sec); + } + } + if (grep(/^all$/,@oksecs)) { + undef($checksec); + } + } + } + return($checksec,@oksecs); +} + +sub sections_grade_privs { + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my %availablesecs = ( + mgr => [], + vgr => [], + usc => [], + ); + my $ccrole = 'cc'; + if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') { + $ccrole = 'co'; + } + my %crsroleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'}, + 'userroles',['active'], + [$ccrole,'in','cr'],$cdom,1); + my $crsid = $cnum.':'.$cdom; + foreach my $item (keys(%crsroleshash)) { + next unless ($item =~ /^$crsid\:/); + my ($crsnum,$crsdom,$role,$sec) = split(/\:/,$item); + my $suffix = "/$cdom/$cnum./$cdom/$cnum"; + if ($sec ne '') { + $suffix = "/$cdom/$cnum/$sec./$cdom/$cnum/$sec"; + } + if (($role eq $ccrole) || ($role eq 'in')) { + foreach my $priv ('mgr','vgr','usc') { + unless (grep(/^all$/,@{$availablesecs{$priv}})) { + if ($sec eq '') { + $availablesecs{$priv} = ['all']; + } elsif ($sec ne $env{'request.course.sec'}) { + unless (grep(/^\Q$sec\E$/,@{$availablesecs{$priv}})) { + push(@{$availablesecs{$priv}},$sec); + } + } + } + } + } elsif ($role =~ m{^cr/}) { + foreach my $priv ('mgr','vgr','usc') { + unless (grep(/^all$/,@{$availablesecs{$priv}})) { + if ($env{"user.priv.$role.$suffix"} =~ /:$priv&/) { + if ($sec eq '') { + $availablesecs{$priv} = ['all']; + } elsif ($sec ne $env{'request.course.sec'}) { + unless (grep(/^\Q$sec\E$/,@{$availablesecs{$priv}})) { + push(@{$availablesecs{$priv}},$sec); + } + } + } + } + } + } + } + return %availablesecs; +} + +sub scantron_upload_delete { + my ($r,$symb) = @_; + my $filename = $env{'form.uploadedfile'}; + if ($filename =~ /^scantron_orig_/) { + if (&Apache::lonnet::allowed('usc',$env{'form.domainid'}) || + &Apache::lonnet::allowed('usc', + $env{'form.domainid'}.'_'.$env{'form.courseid'}) || + &Apache::lonnet::allowed('usc', + $env{'form.domainid'}.'_'.$env{'form.courseid'}.'/'.$env{'form.coursesec'})) { + my $uploadurl = '/uploaded/'.$env{'form.domainid'}.'/'.$env{'form.courseid'}.'/'.$env{'form.uploadedfile'}; + my $retrieval = &Apache::lonnet::getfile($uploadurl); + if ($retrieval eq '-1') { + $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'
    '. + &mt('File requested for deletion not found.')); + } else { + $filename =~ s/^scantron_orig_//; + if ($filename ne '') { + my ($is_valid,$numleft); + my %info = &Apache::lonnet::get('scantronupload',[$filename],$env{'form.domainid'},$env{'form.courseid'}); + if (keys(%info)) { + if (ref($info{$filename}) eq 'HASH') { + foreach my $timestamp (sort(keys(%{$info{$filename}}))) { + if ($info{$filename}{$timestamp} eq $env{'user.name'}.':'.$env{'user.domain'}) { + $is_valid = 1; + delete($info{$filename}{$timestamp}); + } + } + $numleft = scalar(keys(%{$info{$filename}})); + } + } + if ($is_valid) { + my $result = &Apache::lonnet::removeuploadedurl($uploadurl); + if ($result eq 'ok') { + $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion successful')).'
    '); + if ($numleft) { + &Apache::lonnet::put('scantronupload',\%info,$env{'form.domainid'},$env{'form.courseid'}); + } else { + &Apache::lonnet::del('scantronupload',[$filename],$env{'form.domainid'},$env{'form.courseid'}); + } + } else { + $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'
    '. + &mt('Result was [_1]',$result)); + } + } else { + $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'
    '. + &mt('File requested for deletion was uploaded by a different user.')); + } + } else { + $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'
    '. + &mt('Filename of bubblesheet data file requested for deletion is invalid.')); + } + } + } else { + $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'
    '. + &mt('You are not permitted to delete bubblesheet data files from the requested course.')); + } + } else { + $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('File deletion failed'),1).'
    '. + &mt('Filename of bubblesheet data file requested for deletion is invalid.')); + } + return; +} + sub valid_file { my ($requested_file)=@_; foreach my $filename (sort(&scantron_filenames())) { @@ -9775,6 +9956,29 @@ sub scantron_download_scantron_data { '); return; } + my (%uploader,$is_owner,%counts,$percent); + my %uploader = &Apache::lonnet::get('scantronupload',[$file],$cdom,$cname); + if (ref($uploader{$file}) eq 'HASH') { + foreach my $timestamp (sort { $a <=> $b } keys(%{$uploader{$file}})) { + if ($uploader{$file}{$timestamp} eq $env{'user.name'}.':'.$env{'user.domain'}) { + $is_owner = 1; + last; + } + } + } + unless ($is_owner) { + &validate_uploaded_scantron_file($cdom,$cname,$symb,'scantron_orig_'.$file,'download',\%counts); + if ($counts{'totalanysec'}) { + my $percent_othersec = (100*$counts{'othersec'})/($counts{'totalanysec'}); + if ($percent_othersec >= 10) { + my $showpct = sprintf("%.0f",$percent_othersec).'%'; + $r->print('

    '. + &mt('The original uploaded file includes [_1] or more of records for students for which none of your roles have rights to modify grades, so files are unavailable for download.',$showpct). + '

    '); + return; + } + } + } my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file; my $corrected='/uploaded/'.$cdom.'/'.$cname.'/scantron_corrected_'.$file; my $skipped='/uploaded/'.$cdom.'/'.$cname.'/scantron_skipped_'.$file; @@ -9811,7 +10015,7 @@ sub checkscantron_results { my %scantron_config = &Apache::lonnet::get_scantron_config($env{'form.scantron_format'}); my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); - my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile(); + my ($scanlines,$scan_data)=&scantron_getfile(); my $classlist=&Apache::loncoursedata::get_classlist(); my %idmap=&Apache::grades::username_to_idmap($classlist); my $navmap=Apache::lonnavmaps::navmap->new(); @@ -9822,20 +10026,9 @@ sub checkscantron_results { my $map=$navmap->getResourceByUrl($sequence); my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb, %grader_randomlists_by_symb,%orderedforcode); - if (ref($map)) { + if (ref($map)) { $randomorder=$map->randomorder(); $randompick=$map->randompick(); - unless ($randomorder || $randompick) { - foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) { - if ($res->randomorder()) { - $randomorder = 1; - } - if ($res->randompick()) { - $randompick = 1; - } - last if ($randomorder || $randompick); - } - } } my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); my $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource); @@ -9862,8 +10055,7 @@ sub checkscantron_results { return ''; } - &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, - 'Processing first student'); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student'); my $start=&Time::HiRes::time(); my $i=-1; @@ -9873,8 +10065,7 @@ sub checkscantron_results { my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i); if ($line=~/^[\s\cz]*$/) { next; } if ($started) { - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - 'last student'); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); } $started=1; my $scan_record= @@ -9986,19 +10177,21 @@ sub checkscantron_results { } } } - $r->print('

    '. - &mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).', - '', - $numstudents, - '', - $env{'form.scantron_maxbubble'}). - '

    ' + $r->print( + '

    ' + .&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).', + '', + $numstudents, + '', + $env{'form.scantron_maxbubble'}) + .'

    ' ); $r->print('

    ' .&mt('Exact matches for [_1][quant,_2,student][_3].','',$passed,'') .'
    ' .&mt('Discrepancies detected for [_1][quant,_2,student][_3].','',$failed,'') - .'

    '); + .'

    ' + ); if ($passed) { $r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'

    '); $r->print(&Apache::loncommon::start_data_table()."\n". @@ -10163,7 +10356,7 @@ sub grading_menu { my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb), 'command'=>'individual'); - + my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields); $fields{'command'}='ungraded'; @@ -10177,7 +10370,7 @@ sub grading_menu { $fields{'command'}='downloadfilesselect'; my $url1e=&Apache::lonhtmlcommon::build_url('grades/',\%fields); - + $fields{'command'} = 'csvform'; my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); @@ -10189,74 +10382,64 @@ sub grading_menu { $fields{'command'} = 'initialverifyreceipt'; my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields); - - my %permissions; - if ($perm{'mgr'}) { - $permissions{'either'} = 'F'; - $permissions{'mgr'} = 'F'; - } - if ($perm{'vgr'}) { - $permissions{'either'} = 'F'; - $permissions{'vgr'} = 'F'; - } - + my @menu = ({ categorytitle=>'Hand Grading', items =>[ - { linktext => 'Select individual students to grade', - url => $url1a, - permission => $permissions{'either'}, - icon => 'grade_students.png', - linktitle => 'Grade current resource for a selection of students.' - }, + { linktext => 'Select individual students to grade', + url => $url1a, + permission => 'F', + icon => 'grade_students.png', + linktitle => 'Grade current resource for a selection of students.' + }, { linktext => 'Grade ungraded submissions', url => $url1b, - permission => $permissions{'either'}, + permission => 'F', icon => 'ungrade_sub.png', linktitle => 'Grade all submissions that have not been graded yet.' }, { linktext => 'Grading table', url => $url1c, - permission => $permissions{'either'}, + permission => 'F', icon => 'grading_table.png', linktitle => 'Grade current resource for all students.' }, { linktext => 'Grade page/folder for one student', url => $url1d, - permission => $permissions{'either'}, + permission => 'F', icon => 'grade_PageFolder.png', linktitle => 'Grade all resources in current page/sequence/folder for one student.' }, - { linktext => 'Download submitted files', + { linktext => 'Download submissions', url => $url1e, - permission => $permissions{'either'}, + permission => 'F', icon => 'download_sub.png', - linktitle => 'Download all files submitted by students.' + linktitle => 'Download all students submissions.' }]}, { categorytitle=>'Automated Grading', items =>[ { linktext => 'Upload Scores', url => $url2, - permission => $permissions{'mgr'}, + permission => 'F', icon => 'uploadscores.png', linktitle => 'Specify a file containing the class scores for current resource.' }, { linktext => 'Process Clicker', url => $url3, - permission => $permissions{'mgr'}, + permission => 'F', icon => 'addClickerInfoFile.png', linktitle => 'Specify a file containing the clicker information for this resource.' }, { linktext => 'Grade/Manage/Review Bubblesheets', url => $url4, - permission => $permissions{'mgr'}, + permission => 'F', icon => 'bubblesheet.png', linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.' }, { linktext => 'Verify Receipt Number', url => $url5, - permission => $permissions{'either'}, + permission => 'F', icon => 'receipt_number.png', linktitle => 'Verify a system-generated receipt number for correct problem solution.' } @@ -10343,13 +10526,13 @@ sub submit_options_download { &commonJSfunctions($request); my $result='
    '."\n". - $table."\n". - ''."\n"; + $table."\n". + ''."\n"; $result.='

    - '.&mt('Select Students for whom to Download Submitted Files').' + '.&mt('Select Students for whom to Download Submissions').'

    '.&selectfield(1,$is_tool).' - + @@ -10371,8 +10554,8 @@ sub submit_options { $result.=''."\n". ''."\n"; $result.=&selectfield(1,$is_tool).' - - + +
    '; @@ -10387,34 +10570,26 @@ sub selectfield { (&transtatus_options, 'select_form_order' => ['yes','incorrect','all']); } else { - %options = + %options = (&substatus_options, 'select_form_order' => ['yes','queued','graded','incorrect','all']); } - - # - # PrepareClasslist() needs to be called to avoid getting a sections list - # for a different course from the @Sections global in lonstatistics.pm, - # populated by an earlier request. - # - &Apache::lonstatistics::PrepareClasslist(); - my $result='
    - +
    '.&mt('Sections').' '.&Apache::lonstatistics::SectionSelect('section','multiple',5).'
    - +
    '.&mt('Groups').' '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
    - +
    '.&mt('Access Status').' @@ -10462,7 +10637,7 @@ sub reset_perm { sub init_perm { &reset_perm(); - foreach my $test_perm ('vgr','mgr','opa') { + foreach my $test_perm ('vgr','mgr','opa','usc') { my $scope = $env{'request.course.id'}; if (!($perm{$test_perm}=&Apache::lonnet::allowed($test_perm,$scope))) { @@ -10589,7 +10764,7 @@ sub process_clicker { my $pcorrect=&mt("Percentage points for correct solution"); my $pincorrect=&mt("Percentage points for incorrect solution"); my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype', - {'iclicker' => 'i>clicker', + {'iclicker' => 'i>clicker', 'interwrite' => 'interwrite PRS', 'turning' => 'Turning Technologies'}); $symb = &Apache::lonenc::check_encrypt($symb); @@ -10992,6 +11167,7 @@ sub turning_eval { return ($errormsg,$number); } + sub assign_clicker_grades { my ($r,$symb) = @_; if (!$symb) {return '';} @@ -11004,7 +11180,7 @@ sub assign_clicker_grades { # FIXME: This should probably look for the first handgradeable part my $part=$$partlist[0]; # Start screen output - my $result = &Apache::loncommon::start_data_table(). + my $result = &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). ''.&mt('Assigning grades based on clicker file').''. &Apache::loncommon::end_data_table_header_row(). @@ -11063,7 +11239,7 @@ sub assign_clicker_grades { &mt('More than one entry found for [_1]!',''.$user.''). '
    '; } - $users{$user}=1; + $users{$user}=1; my @answer=split(/\,/,$env{$key}); my $sum=0; my $realnumber=$number; @@ -11138,97 +11314,82 @@ sub startpage { $args{'add_entries'} = \%loaditems; } if ($nomenu) { - $args{'only_body'} = 1; + $args{'only_body'} = 1; $r->print(&Apache::loncommon::start_page("Student's Version",$head_extra,\%args)); } else { - if ($env{'request.course.id'}) { - unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"}); - } + unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"}); $args{'bread_crumbs'} = $crumbs; $r->print(&Apache::loncommon::start_page('Grading',$head_extra,\%args)); + if ($env{'request.course.id'}) { + &Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading')); + } } unless ($nodisplayflag) { - $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres)); + $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres)); } } sub select_problem { my ($r)=@_; $r->print('

    '.&mt('Select the problem or one of the problems you want to grade').'

    '); - $r->print(&Apache::lonstathelpers::problem_selector('.',undef,1,undef,undef,1)); + $r->print(&Apache::lonstathelpers::problem_selector('.',undef,1,undef,undef,1,1)); $r->print(''); $r->print('
    '); } -#----- display problem, answer, and submissions for a single student (no grading) - -sub view_as_user { - my ($symb,$vuname,$vudom,$hasperm) = @_; - my $plainname = &Apache::loncommon::plainname($vuname,$vudom,'lastname'); - my $displayname = &nameUserString('',$plainname,$vuname,$vudom); - my $output = &Apache::loncommon::get_student_view($symb,$vuname,$vudom, - $env{'request.course.id'}, - undef,{'disable_submit' => 1}). - "\n\n". - '
    '. - '

    '.$displayname.'

    '. - "\n". - &Apache::loncommon::track_student_link('View recent activity', - $vuname,$vudom,'check').' '. - "\n"; - if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) || - (($env{'request.course.sec'} ne '') && - &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.$env{'request.course.sec'}))) { - $output .= &Apache::loncommon::pprmlink(&mt('Set/Change parameters'), - $vuname,$vudom,$symb,'check'); - } - $output .= "\n"; - my $companswer = &Apache::loncommon::get_student_answers($symb,$vuname,$vudom, - $env{'request.course.id'}); - $companswer=~s|||g; - $companswer=~s|||g; - $companswer=~s|name="submit"|name="would_have_been_submit"|g; - $output .= '
    '. - '

    '.&mt('Correct answer for[_1]',$displayname).'

    '. - $companswer. - '
    '."\n"; - my $is_tool = ($symb =~ /ext\.tool$/); - my ($essayurl,%coursedesc_by_cid); - (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb); - my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$vudom,$vuname); - my $res_error; - my ($partlist,$handgrade,$responseType,$numresp,$numessay) = - &response_type($symb,\$res_error); - my $fullname; - my $collabinfo; - if ($numessay) { - unless ($hasperm) { - &init_perm(); +sub css_links { + my ($currsymb,$level) = @_; + my ($links,@symbs,%cssrefs,%httpref); + if ($level eq 'map') { + my $navmap = Apache::lonnavmaps::navmap->new(); + if (ref($navmap)) { + my ($map,undef,$url)=&Apache::lonnet::decode_symb($currsymb); + my @resources = $navmap->retrieveResources($map,sub { $_[0]->is_problem() },0,0); + foreach my $res (@resources) { + if (ref($res)) { + if ($res->symb()) { + push(@symbs,$res->symb()); + } + } + } + } + } else { + @symbs = ($currsymb); + } + foreach my $symb (@symbs) { + my $css_href = &Apache::lonnet::EXT('resource.0.cssfile',$symb); + if ($css_href =~ /\S/) { + unless ($css_href =~ m{https?://}) { + my ($map,undef,$url)=&Apache::lonnet::decode_symb($symb); + my $proburl = &Apache::lonnet::clutter($url); + my ($probdir) = ($proburl =~ m{(.+)/[^/]+$}); + unless ($css_href =~ m{^/}) { + $css_href = &Apache::lonnet::hreflocation($probdir,$css_href); + } + if ($css_href =~ m{^/(res|uploaded)/}) { + unless (($httpref{'httpref.'.$css_href}) | + (&Apache::lonnet::is_on_map($css_href))) { + my $thisurl = $proburl; + if ($env{'httpref.'.$proburl}) { + $thisurl = $env{'httpref.'.$proburl}; + } + $httpref{'httpref.'.$css_href} = $thisurl; + } + } + } + $cssrefs{$css_href} = 1; } - ($collabinfo,$fullname)= - &check_collaborators($symb,$vuname,$vudom,\%record,$handgrade,0); - unless ($hasperm) { - &reset_perm(); + } + if (keys(%httpref)) { + &Apache::lonnet::appenv(\%httpref); + } + if (keys(%cssrefs)) { + foreach my $css_href (keys(%cssrefs)) { + next unless ($css_href =~ m{^(/res/|/uploaded/|https?://)}); + $links .= ''."\n"; } } - my $checkIcon = ''.&mt('Check Mark'). - ''; - my ($lastsubonly,$partinfo) = - &show_last_submission($vuname,$vudom,$symb,$essayurl,$responseType,'datesub', - '',$fullname,\%record,\%coursedesc_by_cid); - $output .= '
    '. - '

    '.&mt('Submissions').'

    '."\n".$collabinfo."\n"; - if (($numresp > $numessay) & !$is_tool) { - $output .='

    '. - &mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon). - "

    \n"; - } - $output .= $partinfo; - $output .= $lastsubonly; - $output .= &displaySubByDates($symb,\%record,$partlist,$responseType,$checkIcon,$vuname,$vudom); - $output .= '
    '."\n"; - return $output; + return $links; } sub handler { @@ -11242,7 +11403,7 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); # see what command we need to execute - + my @commands=&Apache::loncommon::get_env_multiple('form.command'); my $command=$commands[0]; @@ -11278,11 +11439,11 @@ sub handler { if (($symb eq '' || $command eq '') && ($env{'request.course.id'})) { # # Not called from a resource, but inside a course -# +# &startpage($request,undef,[],1,1); &select_problem($request); } else { - if ($command eq 'submission' && $perm{'vgr'}) { + if ($command eq 'submission' && $perm{'vgr'}) { my ($stuvcurrent,$stuvdisp,$versionform,$js,$onload); if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) { ($stuvcurrent,$stuvdisp,$versionform,$js) = @@ -11298,7 +11459,7 @@ sub handler { } my $head_extra = $js; unless ($env{'form.vProb'} eq 'no') { - my $csslinks = &Apache::loncommon::css_links($symb); + my $csslinks = &css_links($symb); if ($csslinks) { $head_extra .= "\n$csslinks"; } @@ -11311,7 +11472,7 @@ sub handler { } $request->print($versionform); } - ($env{'form.student'} eq '' ? &listStudents($request,$symb,'',$divforres) : &submission($request,0,0,$symb,$divforres,$command)); + ($env{'form.student'} eq '' ? &listStudents($request,$symb,'',$divforres) : &submission($request,0,0,$symb,$divforres,$command)); } elsif ($command eq 'versionsub' && $perm{'vgr'}) { my ($stuvcurrent,$stuvdisp,$versionform,$js) = &choose_task_version_form($symb,$env{'form.student'}, @@ -11319,7 +11480,7 @@ sub handler { $env{'form.inhibitmenu'}); my $head_extra = $js; unless ($env{'form.vProb'} eq 'no') { - my $csslinks = &Apache::loncommon::css_links($symb); + my $csslinks = &css_links($symb); if ($csslinks) { $head_extra .= "\n$csslinks"; } @@ -11331,40 +11492,40 @@ sub handler { } $request->print('
    '); $request->print(&show_previous_task_version($request,$symb)); - } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) { + } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) { &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'}, {href=>'',text=>'Select student'}],1,1); - &pickStudentPage($request,$symb); - } elsif ($command eq 'displayPage' && $perm{'vgr'}) { + &pickStudentPage($request,$symb); + } elsif ($command eq 'displayPage' && $perm{'vgr'}) { my $csslinks; unless ($env{'form.vProb'} eq 'no') { - $csslinks = &Apache::loncommon::css_links($symb,'map'); + $csslinks = &css_links($symb,'map'); } &startpage($request,$symb, [{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'}, {href=>'',text=>'Select student'}, {href=>'',text=>'Grade student'}],1,1,undef,undef,undef,$csslinks); - &displayPage($request,$symb); - } elsif ($command eq 'gradeByPage' && $perm{'mgr'}) { + &displayPage($request,$symb); + } elsif ($command eq 'gradeByPage' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'}, {href=>'',text=>'Select student'}, {href=>'',text=>'Grade student'}, {href=>'',text=>'Store grades'}],1,1); - &updateGradeByPage($request,$symb); - } elsif ($command eq 'processGroup' && $perm{'vgr'}) { + &updateGradeByPage($request,$symb); + } elsif ($command eq 'processGroup' && $perm{'vgr'}) { my $csslinks; unless ($env{'form.vProb'} eq 'no') { - $csslinks = &Apache::loncommon::css_links($symb); + $csslinks = &css_links($symb); } &startpage($request,$symb,[{href=>'',text=>'...'}, {href=>'',text=>'Modify grades'}],undef,undef,undef,undef,undef,$csslinks,undef,1); - &processGroup($request,$symb); - } elsif ($command eq 'gradingmenu' && $perm{'vgr'}) { + &processGroup($request,$symb); + } elsif ($command eq 'gradingmenu' && $perm{'vgr'}) { &startpage($request,$symb); - $request->print(&grading_menu($request,$symb)); - } elsif ($command eq 'individual' && $perm{'vgr'}) { + $request->print(&grading_menu($request,$symb)); + } elsif ($command eq 'individual' && $perm{'vgr'}) { &startpage($request,$symb,[{href=>'',text=>'Select individual students to grade'}]); - $request->print(&submit_options($request,$symb)); + $request->print(&submit_options($request,$symb)); } elsif ($command eq 'ungraded' && $perm{'vgr'}) { my $js = &part_selector_js(); my $onload = "toggleParts('gradesub');"; @@ -11377,26 +11538,26 @@ sub handler { } elsif ($command eq 'all_for_one' && $perm{'vgr'}) { &startpage($request,$symb,[{href=>'',text=>'Grade page/folder for one student'}],1,1); $request->print(&submit_options_sequence($request,$symb)); - } elsif ($command eq 'viewgrades' && $perm{'vgr'}) { + } elsif ($command eq 'viewgrades' && $perm{'vgr'}) { &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},{href=>'', text=>"Modify grades"}]); - $request->print(&viewgrades($request,$symb)); - } elsif ($command eq 'handgrade' && $perm{'mgr'}) { + $request->print(&viewgrades($request,$symb)); + } elsif ($command eq 'handgrade' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>'',text=>'...'}, {href=>'',text=>'Store grades'}]); - $request->print(&processHandGrade($request,$symb)); - } elsif ($command eq 'editgrades' && $perm{'mgr'}) { + $request->print(&processHandGrade($request,$symb)); + } elsif ($command eq 'editgrades' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"}, {href=>&href_symb_cmd($symb,'viewgrades').'&group=all§ion=all&Status=Active', text=>"Modify grades"}, {href=>'', text=>"Store grades"}]); - $request->print(&editgrades($request,$symb)); + $request->print(&editgrades($request,$symb)); } elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) { &startpage($request,$symb,[{href=>'',text=>'Verify Receipt Number'}]); $request->print(&initialverifyreceipt($request,$symb)); - } elsif ($command eq 'verify' && $perm{'vgr'}) { + } elsif ($command eq 'verify' && $perm{'vgr'}) { &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"initialverifyreceipt"),text=>'Verify Receipt Number'}, {href=>'',text=>'Verification Result'}]); - $request->print(&verifyreceipt($request,$symb)); + $request->print(&verifyreceipt($request,$symb)); } elsif ($command eq 'processclicker' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>'', text=>'Process clicker'}]); $request->print(&process_clicker($request,$symb)); @@ -11409,59 +11570,60 @@ sub handler { {href=>'', text=>'Process clicker file'}, {href=>'', text=>'Store grades'}]); $request->print(&assign_clicker_grades($request,$symb)); - } elsif ($command eq 'csvform' && $perm{'mgr'}) { + } elsif ($command eq 'csvform' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); - $request->print(&upcsvScores_form($request,$symb)); - } elsif ($command eq 'csvupload' && $perm{'mgr'}) { + $request->print(&upcsvScores_form($request,$symb)); + } elsif ($command eq 'csvupload' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); - $request->print(&csvupload($request,$symb)); - } elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) { + $request->print(&csvupload($request,$symb)); + } elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) { &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); - $request->print(&csvuploadmap($request,$symb)); - } elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) { - if ($env{'form.associate'} ne 'Reverse Association') { + $request->print(&csvuploadmap($request,$symb)); + } elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) { + if ($env{'form.associate'} ne 'Reverse Association') { &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); - $request->print(&csvuploadoptions($request,$symb)); - } else { - if ( $env{'form.upfile_associate'} ne 'reverse' ) { - $env{'form.upfile_associate'} = 'reverse'; - } else { - $env{'form.upfile_associate'} = 'forward'; - } + $request->print(&csvuploadoptions($request,$symb)); + } else { + if ( $env{'form.upfile_associate'} ne 'reverse' ) { + $env{'form.upfile_associate'} = 'reverse'; + } else { + $env{'form.upfile_associate'} = 'forward'; + } &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); - $request->print(&csvuploadmap($request,$symb)); - } - } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) { + $request->print(&csvuploadmap($request,$symb)); + } + } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) { &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1); - $request->print(&csvuploadassign($request,$symb)); - } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) { + $request->print(&csvuploadassign($request,$symb)); + } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1, undef,undef,undef,undef,'toggleScantab(document.rules);'); - $request->print(&scantron_selectphase($request,undef,$symb)); - } elsif ($command eq 'scantron_warning' && $perm{'mgr'}) { + $request->print(&scantron_selectphase($request,undef,$symb)); + } elsif ($command eq 'scantron_warning' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); - $request->print(&scantron_do_warning($request,$symb)); - } elsif ($command eq 'scantron_validate' && $perm{'mgr'}) { + $request->print(&scantron_do_warning($request,$symb)); + } elsif ($command eq 'scantron_validate' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); - $request->print(&scantron_validate_file($request,$symb)); - } elsif ($command eq 'scantron_process' && $perm{'mgr'}) { + $request->print(&scantron_validate_file($request,$symb)); + } elsif ($command eq 'scantron_process' && $perm{'mgr'}) { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); - $request->print(&scantron_process_students($request,$symb)); - } elsif ($command eq 'scantronupload' && - (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})|| - &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) { + $request->print(&scantron_process_students($request,$symb)); + } elsif ($command eq 'scantronupload' && + (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'})) { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1, undef,undef,undef,undef,'toggleScantab(document.rules);'); - $request->print(&scantron_upload_scantron_data($request,$symb)); - } elsif ($command eq 'scantronupload_save' && - (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})|| - &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) { + $request->print(&scantron_upload_scantron_data($request,$symb)); + } elsif ($command eq 'scantronupload_save' && + (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'})) { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); - $request->print(&scantron_upload_scantron_data_save($request,$symb)); - } elsif ($command eq 'scantron_download' && - &Apache::lonnet::allowed('usc',$env{'request.course.id'})) { + $request->print(&scantron_upload_scantron_data_save($request,$symb)); + } elsif ($command eq 'scantron_download' && ($perm{'usc'} || $perm{'mgr'})) { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); - $request->print(&scantron_download_scantron_data($request,$symb)); + $request->print(&scantron_download_scantron_data($request,$symb)); + } elsif ($command eq 'scantronupload_delete' && + (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) || $perm{'usc'})) { + &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); + &scantron_upload_delete($request,$symb); } elsif ($command eq 'checksubmissions' && $perm{'vgr'}) { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); $request->print(&checkscantron_results($request,$symb)); @@ -11478,15 +11640,19 @@ sub handler { undef,undef,undef,undef,undef,undef,undef,1); $request->print('
    '); &submit_download_link($request,$symb); - } elsif ($command) { + } elsif ($command) { &startpage($request,$symb,[{href=>'', text=>'Access denied'}]); - $request->print('

    '.&mt('Access Denied ([_1])',$command).'

    '); - } + $request->print('

    '.&mt('Access Denied ([_1])',$command).'

    '); + } } if ($ssi_error) { &ssi_print_error($request); } - $request->print(&Apache::loncommon::end_page()); + if ($env{'form.inhibitmenu'}) { + $request->print(&Apache::loncommon::end_page()); + } elsif ($env{'request.course.id'}) { + &Apache::lonquickgrades::endGradeScreen($request); + } &reset_caches(); return OK; } @@ -11510,7 +11676,7 @@ described at http://www.lon-capa.org. =head1 OVERVIEW Do an ssi with retries: -While I'd love to factor out this with the vesrion in lonprintout, +While I'd love to factor out this with the version in lonprintout, that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure I'm not quite ready to invent (e.g. an ssi_with_retry object). @@ -11557,6 +11723,75 @@ ssi_with_retries() =over +=head1 Routines to display previous version of a Task for a specific student + +Tasks are graded pass/fail. Students who have yet to pass a particular Task +can receive another opportunity. Access to tasks is slot-based. If a slot +requires a proctor to check-in the student, a new version of the Task will +be created when the student is checked in to the new opportunity. + +If a particular student has tried two or more versions of a particular task, +the submission screen provides a user with vgr privileges (e.g., a Course +Coordinator) the ability to display a previous version worked on by the +student. By default, the current version is displayed. If a previous version +has been selected for display, submission data are only shown that pertain +to that particular version, and the interface to submit grades is not shown. + +=over 4 + +=item show_previous_task_version() + +Displays a specified version of a student's Task, as the student sees it. + +Inputs: 2 + request - request object + symb - unique symb for current instance of resource + +Output: None. + +Side Effects: calls &show_problem() to print version of Task, with + version contained in form item: $env{'form.previousversion'} + +=item choose_task_version_form() + +Displays a web form used to select which version of a student's view of a +Task should be displayed. Either launches a pop-up window, or replaces +content in existing pop-up, or replaces page in main window. + +Inputs: 4 + symb - unique symb for current instance of resource + uname - username of student + udom - domain of student + nomenu - 1 if display is in a pop-up window, and hence no menu + breadcrumbs etc., are displayed + +Output: 4 + current - student's current version + displayed - student's version being displayed + result - scalar containing HTML for web form used to switch to + a different version (or a link to close window, if pop-up). + js - javascript for processing selection in versions web form + +Side Effects: None. + +=item previous_display_javascript() + +Inputs: 2 + nomenu - 1 if display is in a pop-up window, and hence no menu + breadcrumbs etc., are displayed. + current - student's current version number. + +Output: 1 + js - javascript for processing selection in versions web form. + +Side Effects: None. + +=back + +=head1 Routines to process bubblesheet data. + +=over 4 + =item scantron_get_correction() : Builds the interface screen to interact with the operator to fix a @@ -11583,8 +11818,8 @@ ssi_with_retries() - missingbubble - array ref of the bubble lines that have missing bubble errors - $randomorder - True if exam folder (or a sub-folder) has randomorder set - $randompick - True if exam folder (or a sub-folder) has randompick set + $randomorder - True if exam folder has randomorder set + $randompick - True if exam folder has randompick set $respnumlookup - Reference to HASH mapping question numbers in bubble lines for current line to question number used for same question in "Master Seqence" (as seen by Course Coordinator). @@ -11593,6 +11828,7 @@ ssi_with_retries() or code-based randompick and/or randomorder. + =item scantron_get_maxbubble() : Arguments: @@ -11652,7 +11888,12 @@ ssi_with_retries() =item scantron_upload_scantron_data_save() : Adds a provided bubble information data file to the course if user - has the correct privileges to do so. + has the correct privileges to do so. + += item scantron_upload_delete() : + + Deletes a previously uploaded bubble information data file, if user + was the one who uploaded the file, and has the privileges to do so. =item valid_file() : @@ -11672,7 +11913,9 @@ ssi_with_retries() =item navmap_errormsg() : Returns HTML mark-up inside a
    with a link to re-initialize the course. - Should be called whenever the request to instantiate a navmap object fails. + Should be called whenever the request to instantiate a navmap object fails. + +=back =back