--- loncom/homework/grades.pm 2020/08/26 18:13:40 1.771 +++ loncom/homework/grades.pm 2023/02/12 21:01:30 1.792 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.771 2020/08/26 18:13:40 raeburn Exp $ +# $Id: grades.pm,v 1.792 2023/02/12 21:01:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -147,7 +147,7 @@ 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 { my ($symb,$response_error) = @_; @@ -165,6 +165,7 @@ sub response_type { return; } my $partlist = $res->parts(); + my ($numresp,$numessay,$numdropbox) = (0,0,0); my %vPart = map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart')); my (%response_types,%handgrade); @@ -174,13 +175,20 @@ sub response_type { my @types = $res->responseType($part); my @ids = $res->responseIds($part); for (my $i=0; $i < scalar(@ids); $i++) { + $numresp ++; $response_types{$part}{$ids[$i]} = $types[$i]; + if ($types[$i] eq 'essay') { + $numessay ++; + if (&Apache::lonnet::EXT("resource.$part".'_'.$ids[$i].".uploadedfiletypes",$symb)) { + $numdropbox ++; + } + } $handgrade{$part.'_'.$ids[$i]} = &Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i]. '.handgrade',$symb); } } - return ($partlist,\%handgrade,\%response_types); + return ($partlist,\%handgrade,\%response_types,$numresp,$numessay,$numdropbox); } sub flatten_responseType { @@ -207,6 +215,129 @@ sub get_display_part { return $display; } +#--- Show parts and response type +sub showResourceInfo { + my ($symb,$partlist,$responseType,$formname,$checkboxes,$uploads) = @_; + unless ((ref($partlist) eq 'ARRAY') && (ref($responseType) eq 'HASH')) { + return '
'; + } + my $coltitle = &mt('Problem Part Shown'); + if ($checkboxes) { + $coltitle = &mt('Problem Part'); + } else { + my $checkedparts = 0; + foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) { + if (grep(/^\Q$partid\E$/,@{$partlist})) { + $checkedparts ++; + } + } + if ($checkedparts == scalar(@{$partlist})) { + return '
'; + } + if ($uploads) { + $coltitle = &mt('Problem Part Selected'); + } + } + my $result = '
'; + if ($checkboxes) { + my $legend = &mt('Parts to display'); + if ($uploads) { + $legend = &mt('Part(s) with dropbox'); + } + $result .= '
'.$legend.''. + ''. + ''.(' 'x2). + ''. + '
'; + } + $result .= '
'; + if (!keys(%partsseen)) { + $result = ''; + if ($uploads) { + return '
'. + '

'. + &mt('No dropbox items or essayresponse items with uploadedfiletypes set.'). + '

'; + } else { + return '
'; + } + } + return $result; +} + +sub part_selector_js { + my $js = <<"END"; +function toggleParts(formname) { + if (document.getElementById('LC_partselector')) { + var index = ''; + if (document.forms.length) { + for (var i=0; i 1)) { + for (var i=0; i 1 ) { + $table = &showResourceInfo($symb,$partlist,$responseType,'gradesub',1); + } elsif ($divforres) { + $table = '
'; + } else { + $table = '
'; + } + } my %js_lt = &Apache::lonlocal::texthash ( 'multiple' => 'Please select a student or group of students before clicking on the Next button.', @@ -963,8 +1105,8 @@ LISTJAVASCRIPT $request->print($result); my $gradeTable='
'. - "\n"; - + "\n".$table; + $gradeTable .= &Apache::lonhtmlcommon::start_pick_box(); unless ($is_tool) { $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text')) @@ -979,7 +1121,6 @@ LISTJAVASCRIPT .&Apache::lonhtmlcommon::row_closure(); } - my $submission_options; my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status; $env{'form.Status'} = $saveStatus; @@ -999,7 +1140,7 @@ LISTJAVASCRIPT all => 'all submissions with details', ); } - $submission_options.= + my $submission_options = ''. ''."\n". @@ -1018,48 +1159,77 @@ LISTJAVASCRIPT } else { $viewtitle = &mt('View Submissions'); } + my ($compmsg,$nocompmsg); + $nocompmsg = ' checked="checked"'; + if ($numessay) { + $compmsg = $nocompmsg; + $nocompmsg = ''; + } $gradeTable .= &Apache::lonhtmlcommon::row_title($viewtitle) - .$submission_options + .$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() + .&Apache::lonhtmlcommon::row_title(&mt('Send Messages')) + .'' + .'' + .'' .&Apache::lonhtmlcommon::row_closure(); - my $closure; - if (($is_tool) && (exists($env{'form.Status'}))) { - $closure = 1; - } - $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments')) + $gradeTable .= + &Apache::lonhtmlcommon::row_title(&mt('Grading Increments')) .'' - .&Apache::lonhtmlcommon::row_closure($closure); - + .''; + } $gradeTable .= &build_section_inputs(). ''."\n". ''."\n". ''."\n"; - if (exists($env{'form.Status'})) { - $gradeTable .= ''."\n"; + $gradeTable .= ''."\n"; } else { - if ($is_tool) { - $closure = 1; - } - $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status')) + $gradeTable .= &Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title(&mt('Student Status')) .&Apache::lonhtmlcommon::StatusOptions( - $saveStatus,undef,1,'javascript:reLoadList(this.form);') - .&Apache::lonhtmlcommon::row_closure($closure); + $saveStatus,undef,1,'javascript:reLoadList(this.form);'); } - - unless ($is_tool) { - $closure = 1; - $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism')) - .'' - .&Apache::lonhtmlcommon::row_closure($closure); + if ($numessay) { + $gradeTable .= &Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism')) + .''; } - $gradeTable .= &Apache::lonhtmlcommon::end_pick_box(); + $gradeTable .= &Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box(); my $regrademsg; if ($is_tool) { $regrademsg =&mt("To view/grade/regrade, click on the check box(es) next to the student's name(s). Then click on the Next button."); @@ -1447,8 +1617,8 @@ sub sub_page_js { SUBJAVASCRIPT } -#--- javascript for essay type problem -- -sub sub_page_kw_js { +#--- javascript for grading message center +sub sub_grademessage_js { my $request = shift; my $iconpath = $request->dir_config('lonIconsURL'); &commonJSfunctions($request); @@ -1494,55 +1664,17 @@ sub sub_page_kw_js { INNERJS - my $inner_js_highlight_central= (< - function updateChoice(flag) { - opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr); - opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize); - opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle); - opener.document.SCORE.refresh.value = "on"; - if (opener.document.SCORE.keywords.value!=""){ - opener.document.SCORE.submit(); - } - self.close() - } - -INNERJS - - my $start_page_msg_central = + my $start_page_msg_central = &Apache::loncommon::start_page('Message Central',$inner_js_msg_central, {'js_ready' => 1, 'only_body' => 1, 'bgcolor' =>'#FFFFFF',}); - my $end_page_msg_central = - &Apache::loncommon::end_page({'js_ready' => 1}); - - - my $start_page_highlight_central = - &Apache::loncommon::start_page('Highlight Central', - $inner_js_highlight_central, - {'js_ready' => 1, - 'only_body' => 1, - 'bgcolor' =>'#FFFFFF',}); - my $end_page_highlight_central = + my $end_page_msg_central = &Apache::loncommon::end_page({'js_ready' => 1}); my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); $docopen=~s/^document\.//; - my %js_lt = &Apache::lonlocal::texthash( - keyw => 'Keywords list, separated by a space. Add/delete to list if desired.', - plse => 'Please select a word or group of words from document and then click this link.', - adds => 'Add selection to keyword list? Edit if desired.', - col1 => 'red', - col2 => 'green', - col3 => 'blue', - siz1 => 'normal', - siz2 => '+1', - siz3 => '+2', - sty1 => 'normal', - sty2 => 'italic', - sty3 => 'bold', - ); + my %html_js_lt = &Apache::lonlocal::texthash( comp => 'Compose Message for: ', incl => 'Include', @@ -1552,29 +1684,11 @@ INNERJS new => 'New', save => 'Save', canc => 'Cancel', - kehi => 'Keyword Highlight Options', - txtc => 'Text Color', - font => 'Font Size', - fnst => 'Font Style', ); - &js_escape(\%js_lt); &html_escape(\%html_js_lt); &js_escape(\%html_js_lt); $request->print(&Apache::lonhtmlcommon::scripttag(< + function updateChoice(flag) { + opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr); + opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize); + opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle); + opener.document.SCORE.refresh.value = "on"; + if (opener.document.SCORE.keywords.value!=""){ + opener.document.SCORE.submit(); + } + self.close() + } + +INNERJS + + my $start_page_highlight_central = + &Apache::loncommon::start_page('Highlight Central', + $inner_js_highlight_central, + {'js_ready' => 1, + 'only_body' => 1, + 'bgcolor' =>'#FFFFFF',}); + my $end_page_highlight_central = + &Apache::loncommon::end_page({'js_ready' => 1}); + + my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); + $docopen=~s/^document\.//; + + my %js_lt = &Apache::lonlocal::texthash( + keyw => 'Keywords list, separated by a space. Add/delete to list if desired.', + plse => 'Please select a word or group of words from document and then click this link.', + adds => 'Add selection to keyword list? Edit if desired.', + col1 => 'red', + col2 => 'green', + col3 => 'blue', + siz1 => 'normal', + siz2 => '+1', + siz3 => '+2', + sty1 => 'normal', + sty2 => 'italic', + sty3 => 'bold', + ); + my %html_js_lt = &Apache::lonlocal::texthash( + save => 'Save', + canc => 'Cancel', + kehi => 'Keyword Highlight Options', + txtc => 'Text Color', + font => 'Font Size', + fnst => 'Font Style', + ); + &js_escape(\%js_lt); + &html_escape(\%html_js_lt); + &js_escape(\%html_js_lt); + $request->print(&Apache::lonhtmlcommon::scripttag(<print(&mt('An error occurred retrieving response types')); - return; - } + my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) = + &response_type($symb,\$res_error); + if ($res_error) { + $request->print(&mt('An error occurred retrieving response types')); + return; } - my ($numupload,$numessay) = (0,0); - if (ref($responseType) eq 'HASH') { - foreach my $part (sort(keys(%$responseType))) { - foreach my $id (sort(keys(%{ $responseType->{$part} }))) { - my $responsetype = $responseType->{$part}->{$id}; - if ($responsetype eq 'essay') { - my $uploadedfiletypes = - &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes",$symb); - if ($uploadedfiletypes) { - $numupload++; - } else { - $numessay++; - } - } - } - } + unless ($numessay) { + $request->print(&mt('No essayresponse items found')); + return; + } + my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart'); + if (@chosenparts) { + $request->print(&showResourceInfo($symb,$partlist,$responseType, + undef,undef,1)); } - if (($numupload) || ($numessay)) { + if ($numessay) { my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'}; my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'}; @@ -2081,10 +2267,12 @@ sub submit_download_link { my @students = map { $_.':'.$fullname->{$_} } (keys(%{$fullname})); if (@students) { @{$env{'form.stuinfo'}} = @students; - if ($numupload) { + if ($numdropbox) { &download_all_link($request,$symb); + } else { + $request->print(&mt('No essayrespose items with dropbox found')); } -# FIXME Need to provide a mechanism to download essays, i.e., if $numessay > 0 +# FIXME Need a mechanism to download essays, i.e., if $numessay > $numdropbox # Needs to omit user's identity if resource instance is for an anonymous survey. } else { $request->print(&mt('No students match the criteria you selected')); @@ -2113,14 +2301,14 @@ sub build_section_inputs { # --------------------------- show submissions of a student, option to grade sub submission { - my ($request,$counter,$total,$symb) = @_; + my ($request,$counter,$total,$symb,$divforres,$calledby) = @_; my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'}); $udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student? my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'}); $env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq ''; - my $probtitle=&Apache::lonnet::gettitle($symb); if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; } + my $probtitle=&Apache::lonnet::gettitle($symb); my $is_tool = ($symb =~ /ext\.tool$/); my ($essayurl,%coursedesc_by_cid); @@ -2134,11 +2322,22 @@ sub submission { return; } + my $res_error; + my ($partlist,$handgrade,$responseType,$numresp,$numessay) = + &response_type($symb,\$res_error); + if ($res_error) { + $request->print(&navmap_errormsg()); + return; + } + if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; } unless ($is_tool) { if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; } if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; } } + if (($numessay) && ($calledby eq 'submission') && (!exists($env{'form.compmsg'}))) { + $env{'form.compmsg'} = 1; + } my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : ''); my $checkIcon = ''.&mt('Check Mark').
 	''); + } else { + $request->print('
'); + } &sub_page_js($request); - &sub_page_kw_js($request); + &sub_grademessage_js($request) if ($env{'form.compmsg'}); + &sub_page_kw_js($request) if ($numessay); # option to display problem, only once else it cause problems # with the form later since the problem has a form. @@ -2164,24 +2372,27 @@ sub submission { $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode)); } - # kwclr is the only variable that is guaranteed not to be blank - # if this subroutine has been called once. my %keyhash = (); -# if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') { - if (1) { + if (($env{'form.kwclr'} eq '' && $numessay) || ($env{'form.compmsg'})) { %keyhash = &Apache::lonnet::dump('nohist_handgrade', $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); - + } + # kwclr is the only variable that is guaranteed not to be blank + # if this subroutine has been called once. + if ($env{'form.kwclr'} eq '' && $numessay) { my $loginuser = $env{'user.name'}.':'.$env{'user.domain'}; $env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : ''; $env{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red'; $env{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0'; $env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; - $env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ? + } + if ($env{'form.compmsg'}) { + $env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ? $keyhash{$symb.'_subject'} : $probtitle; $env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0'; } + my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'}; my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); $request->print(''."\n". @@ -2195,24 +2406,23 @@ sub submission { ''."\n". ''."\n". ''."\n". + ''."\n". &build_section_inputs(). ''."\n". ''."\n"); -# if ($env{'form.handgrade'} eq 'yes') { - if (1) { + if ($env{'form.compmsg'}) { + $request->print(''."\n". + ''."\n". + ''."\n"); + } + if ($numessay) { $request->print(''."\n". ''."\n". ''."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n"); - foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) { - $request->print(''."\n"); - } + ''."\n"); } - + my ($cts,$prnmsg) = (1,''); while ($cts <= $env{'form.savemsgN'}) { $prnmsg.=''.$boxtitle.''; $result.=''."\n"; -# if ($env{'form.handgrade'} eq 'no') { - unless ($is_tool) { + if (($numresp > $numessay) && !$is_tool) { $result.='

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

\n"; } - # If any part of the problem is an essay-response (handgraded), then check for collaborators + # If any part of the problem is an essayresponse, then check for collaborators my $fullname; my $col_fullnames = []; -# if ($env{'form.handgrade'} eq 'yes') { - unless ($is_tool) { + if ($numessay) { (my $sub_result,$fullname,$col_fullnames)= &check_collaborators($symb,$uname,$udom,\%record,$handgrade, $counter); $result.=$sub_result; } $request->print($result."\n"); - + # print student answer/submission - # Options are (1) Handgraded submission only - # (2) Last submission, includes submission that is not handgraded - # (for multi-response type part) - # (3) Last submission plus the parts info - # (4) The whole record for this student - - my ($string,$timestamp)= &get_last_submission(\%record,$is_tool); - + # Options are (1) Last submission only + # (2) Last submission (with detailed information for that submission) + # (3) All transactions (by date) + # (4) The whole record (with detailed information for all transactions) + + my ($string,$timestamp,$lastgradetime,$lastsubmittime) = + &get_last_submission(\%record,$is_tool); + my $lastsubonly; - if ($$timestamp eq '') { - $lastsubonly.='
'.$$string[0].'
'; + if ($timestamp eq '') { + $lastsubonly.='
'.$string->[0].'
'; } elsif ($is_tool) { $lastsubonly = '
' - .''.&mt('Date Grade Passed Back:').' '.$$timestamp."
\n"; + .''.&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:').' '.$$timestamp."\n"; + .''.&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) { - next if ($env{'form.lastSub'} eq 'hdgrade' - && $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes'); - my ($partid,$respid) = @{ $part }; my $display_part=&get_display_part($partid,$symb); if ($env{"form.$uname:$udom:$partid:submitted_by"}) { @@ -2393,7 +2603,7 @@ sub submission { $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.''). '
'); next; - } + } my $responsetype = $responseType->{$partid}->{$respid}; if (!exists($record{"resource.$partid.$respid.submission"})) { $lastsubonly.="\n".'
'. @@ -2417,8 +2627,8 @@ sub submission { $rndseed = $record{"resource.$partid.rndseed"}; } if ($env{'form.checkPlag'}) { - my ($oname,$odom,$ocrsid,$oessay,$osim)= - &most_similar($uname,$udom,$symb,$subval); + my ($oname,$odom,$ocrsid,$oessay,$osim)= + &most_similar($uname,$udom,$symb,$subval); if ($osim) { $osim=int($osim*100.0); if ($hide eq 'anon') { @@ -2472,8 +2682,9 @@ sub submission { } 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)$/ || ($env{'form.lastSub'} eq 'hdgrade' && - $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) { + 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).''. @@ -2481,7 +2692,6 @@ sub submission { '('.&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})); @@ -2493,7 +2703,7 @@ sub submission { } else { $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!'); } - $lastsubonly .= ''; + $lastsubonly .= ''; foreach my $file (@$files) { &Apache::lonnet::allowuploaded('/adm/grades',$file); $lastsubonly.='
'.$file.''; @@ -2504,7 +2714,7 @@ sub submission { if ($hide eq 'anon') { $lastsubonly.='
'.&mt('Anonymous Survey').''; } else { - $lastsubonly.='
'.&mt('Submitted Answer:').' '; + $lastsubonly.='
'.&mt('Submitted Answer:').' '; if ($draft) { $lastsubonly.= ' '.&mt('Draft Copy').''; } @@ -2516,7 +2726,7 @@ sub submission { } $lastsubonly.=$subval."\n"; } - if ($similar) {$lastsubonly.="

$similar\n";} + if ($similar) {$lastsubonly.="

$similar\n";} $lastsubonly.='
'; } } @@ -2527,8 +2737,7 @@ sub submission { 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, @@ -2547,32 +2756,31 @@ sub submission { $request->print('
'."\n"); } - # essay grading message center -# if ($env{'form.handgrade'} eq 'yes') { - if (1) { - my $result='
'; - - $result.='
'. - &mt('Send Message').'
'; - my ($lastname,$givenn) = split(/,/,$env{'form.fullname'}); - my $msgfor = $givenn.' '.$lastname; - if (scalar(@$col_fullnames) > 0) { - my $lastone = pop(@$col_fullnames); - $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.'; - } - $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript - $result.=''."\n". - ''."\n"; - $result.=' '. - &mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).')'. - ' '."\n". - '
 ('. - &mt('Message will be sent when you click on Save & Next below.').")\n"; - $result.='
'; - $request->print($result); + # grading message center + + if ($env{'form.compmsg'}) { + my $result='
'. + '

'.&mt('Send Message').'

'. + '
'; + my ($lastname,$givenn) = split(/,/,$env{'form.fullname'}); + my $msgfor = $givenn.' '.$lastname; + if (scalar(@$col_fullnames) > 0) { + my $lastone = pop(@$col_fullnames); + $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.'; + } + $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript + $result.=''."\n". + ''."\n". + ' '. + &mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).')'. + ' '."\n". + '
 ('. + &mt('Message will be sent when you click on Save & Next below.').")\n". + '
'; + $request->print($result); } my %seen = (); @@ -2594,8 +2802,6 @@ sub submission { my $part_resp = join('_',@{ $part_response_id }); next if ($seen{$partid} > 0); $seen{$partid}++; - next if ($$handgrade{$part_resp} ne 'yes' - && $env{'form.lastSub'} eq 'hdgrade'); push(@partlist,$partid); push(@gradePartRespid,$partid.'.'.$respid); $request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); @@ -2710,17 +2916,45 @@ sub check_collaborators { #--- Retrieve the last submission for all the parts sub get_last_submission { my ($returnhash,$is_tool)=@_; - my (@string,$timestamp,%lasthidden); + my (@string,$timestamp,$lastgradetime,$lastsubmittime); if ($$returnhash{'version'}) { my %lasthash=(); - my ($version); + my %prevsolved=(); + my %solved=(); + my $version; for ($version=1;$version<=$$returnhash{'version'};$version++) { + my %handgraded = (); foreach my $key (sort(split(/\:/, $$returnhash{$version.':keys'}))) { $lasthash{$key}=$$returnhash{$version.':'.$key}; - $timestamp = - &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'}); + 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'}); } my (%typeparts,%randombytry); my $showsurv = @@ -2784,7 +3018,7 @@ sub get_last_submission { $string[0] = ''.$msg.''; } - return (\@string,\$timestamp); + return (\@string,$timestamp,$lastgradetime,$lastsubmittime); } #--- High light keywords, with style choosen by user. @@ -2991,13 +3225,31 @@ 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); + &saveHandGrade($request,$symb,$uname,$udom,$ctr,undef,undef,\%queueable); if ($errorflag eq 'no_score') { $ctr++; next; @@ -3052,7 +3304,7 @@ sub processHandGrade { foreach my $collaborator (@collaborators) { my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$collaborator,$udom,$ctr, - $env{'form.unamedom'.$ctr},$part); + $env{'form.unamedom'.$ctr},$part,\%queueable); if ($errorflag eq 'not_allowed') { $request->print("".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom").""); next; @@ -3074,13 +3326,12 @@ sub processHandGrade { } } -# if ($env{'form.handgrade'} eq 'yes') { - if (1) { + my %keyhash = (); + if ($numessay) { # Keywords sorted in alphabatical order my $loginuser = $env{'user.name'}.':'.$env{'user.domain'}; - my %keyhash = (); $env{'form.keywords'} =~ s/,\s{0,}|\s+/ /g; - $env{'form.keywords'} =~ s/^\s+|\s+$//; + $env{'form.keywords'} =~ s/^\s+|\s+$//g; my (@keywords) = sort(split(/\s+/,$env{'form.keywords'})); $env{'form.keywords'} = join(' ',@keywords); $keyhash{$symb.'_keywords'} = $env{'form.keywords'}; @@ -3088,7 +3339,9 @@ sub processHandGrade { $keyhash{$loginuser.'_kwclr'} = $env{'form.kwclr'}; $keyhash{$loginuser.'_kwsize'} = $env{'form.kwsize'}; $keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'}; + } + if ($env{'form.compmsg'}) { # message center - Order of message gets changed. Blank line is eliminated. # New messages are saved in env for the next student. # All messages are saved in nohist_handgrade.db @@ -3103,17 +3356,20 @@ 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++; } $env{'form.savemsgN'} = --$idx; $keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'}; - my $putresult = &Apache::lonnet::put - ('nohist_handgrade',\%keyhash,$cdom,$cnum); } + if (($numessay) || ($env{'form.compmsg'})) { + my $putresult = &Apache::lonnet::put + ('nohist_handgrade',\%keyhash,$cdom,$cnum); + } + # Called by Save & Refresh from Highlight Attribute Window my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1'); if ($env{'form.refresh'} eq 'on') { @@ -3153,7 +3409,6 @@ sub processHandGrade { } return $a cmp $b; } (keys(%$fullname))) { -# FIXME: this is fishy, looks like the button label if ($nextflg == 1 && $button =~ /Next$/) { push(@parsedlist,$item); } @@ -3164,14 +3419,7 @@ sub processHandGrade { } } $ctr = 0; -# FIXME: this is fishy, looks like the button label @parsedlist = reverse @parsedlist if ($button eq 'Previous'); - my $res_error; - my ($partlist) = &response_type($symb,\$res_error); - if ($res_error) { - $request->print(&navmap_errormsg()); - return; - } foreach my $student (@parsedlist) { my $submitonly=$env{'form.submitonly'}; my ($uname,$udom) = split(/:/,$student); @@ -3229,7 +3477,7 @@ sub processHandGrade { #---- Save the score and award for each student, if changed sub saveHandGrade { - my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_; + my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part,$queueable) = @_; my @version_parts; my $usec = &Apache::lonnet::getsection($domain,$stuname, $env{'request.course.id'}); @@ -3341,7 +3589,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); + $cdom,$cnum,$domain,$stuname,$queueable); } if ($aggregateflag) { &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate, @@ -3381,7 +3629,7 @@ sub makehidden { } sub check_and_remove_from_queue { - my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_; + my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname,$queueable) = @_; my @ungraded_parts; foreach my $part (@{$parts}) { if ( $record->{ 'resource.'.$part.'.awarded'} eq '' @@ -3389,7 +3637,9 @@ sub check_and_remove_from_queue { && $newrecord->{'resource.'.$part.'.awarded'} eq '' && $newrecord->{'resource.'.$part.'.solved' } ne 'excused' ) { - push(@ungraded_parts, $part); + if ($queueable->{$part}) { + push(@ungraded_parts, $part); + } } } if ( !@ungraded_parts ) { @@ -3424,7 +3674,7 @@ sub handback_files { &Apache::lonnet::file_name_version_ext($answer_file); my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/); my $getpropath = 1; - my ($dir_list,$listerror) = + my ($dir_list,$listerror) = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path, $domain,$stuname,$getpropath); my $version = &Apache::lonnet::get_next_version($answer_name,$answer_ext,$dir_list); @@ -3808,7 +4058,26 @@ sub viewgrades { } my ($common_header,$specific_header,@sections,$section_display); - @sections = &Apache::loncommon::get_env_multiple('form.section'); + 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; + } + } + } + } if (grep(/^all$/,@sections)) { @sections = ('all'); if ($group_display) { @@ -3884,7 +4153,6 @@ sub viewgrades { my $part_resp = join('_',@{ $part_response_id }); next if $seen{$partid}; $seen{$partid}++; -# my $handgrade=$$handgrade{$part_resp}; my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb); $weight{$partid} = $wgt eq '' ? '1' : $wgt; @@ -4001,7 +4269,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')); @@ -4264,6 +4532,7 @@ 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); @@ -4363,14 +4632,33 @@ 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 ( $record{'resource.'.$part.'.awarded'} eq '' ) { - $all_graded = 0; - } else { - $none_graded = 0; + if ($queueable{$part}) { + if ( $record{'resource.'.$part.'.awarded'} eq '' ) { + $all_graded = 0; + } else { + $none_graded = 0; + } } - } - + } if ($all_graded || $none_graded) { &Apache::bridgetask::remove_from_queue('gradingqueue', $symb,$cdom,$cnum, @@ -5241,10 +5529,14 @@ sub displayPage { } $curRes = $iterator->next(); } + my $disabled; + unless (&canmodify($usec)) { + $disabled = ' disabled="disabled"'; + } $studentTable.= ''."\n". - ''. ''."\n"; $request->print($studentTable); @@ -5480,6 +5772,7 @@ 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); @@ -5489,7 +5782,20 @@ 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; @@ -5555,7 +5861,7 @@ sub updateGradeByPage { $env{'request.course.id'}, $udom,$uname); &check_and_remove_from_queue($parts,\%record,undef,$symbx, - $cdom,$cnum,$udom,$uname); + $cdom,$cnum,$udom,$uname,\%queueable); } if ($aggregateflag) { @@ -6467,9 +6773,12 @@ sub scantron_parse_scanline { } sub get_master_seq { - my ($resources,$master_seq,$symb_to_resource) = @_; + 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') && (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; @@ -6477,6 +6786,14 @@ 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; @@ -8488,6 +8805,17 @@ 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) { @@ -8671,6 +8999,17 @@ 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) { @@ -8812,10 +9151,21 @@ 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); + %grader_randomlists_by_symb,%symb_for_examcode); 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 ''; @@ -8823,7 +9173,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); + $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource,1,\%symb_for_examcode); if ($nav_error) { $r->print(&navmap_errormsg()); return ''; @@ -8978,11 +9328,16 @@ SCANTRONFORM } if (($scancode) && ($randomorder || $randompick)) { - my $parmresult = - &Apache::lonparmset::storeparm_by_symb($symb, - '0_examcode',2,$scancode, - 'string_examcode',$uname, - $udom); + 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); + } + } } $completedstudents{$uname}={'line'=>$line}; if ($env{'form.verifyrecord'}) { @@ -9297,14 +9652,14 @@ END my @lines = &Apache::lonnet::get_scantronformat_file(); my $count = 0; foreach my $line (@lines) { - next if ($line =~ /^#/); + next if (($line =~ /^\#/) || ($line eq '')); $singleline = $line; $count ++; } if ($count > 1) { $formatextra = ''; $onclick = ' onclick="toggleScantab(this.form);"'; $formatjs = <<"END"; @@ -9491,7 +9846,7 @@ sub validate_uploaded_scantron_file { my %unique_formats; my @formatlines = &Apache::lonnet::get_scantronformat_file(); foreach my $line (@formatlines) { - chomp($line); + next if (($line =~ /^\#/) || ($line eq '')); my @config = split(/:/,$line); my $idstart = $config[5]; my $idlength = $config[6]; @@ -9861,6 +10216,17 @@ sub checkscantron_results { 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); @@ -10214,37 +10580,47 @@ 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 => 'F', + permission => $permissions{'either'}, icon => 'grade_students.png', linktitle => 'Grade current resource for a selection of students.' }, { linktext => 'Grade ungraded submissions', url => $url1b, - permission => 'F', + permission => $permissions{'either'}, icon => 'ungrade_sub.png', linktitle => 'Grade all submissions that have not been graded yet.' }, { linktext => 'Grading table', url => $url1c, - permission => 'F', + permission => $permissions{'either'}, icon => 'grading_table.png', linktitle => 'Grade current resource for all students.' }, { linktext => 'Grade page/folder for one student', url => $url1d, - permission => 'F', + permission => $permissions{'either'}, icon => 'grade_PageFolder.png', linktitle => 'Grade all resources in current page/sequence/folder for one student.' }, { linktext => 'Download submissions', url => $url1e, - permission => 'F', + permission => $permissions{'either'}, icon => 'download_sub.png', linktitle => 'Download all students submissions.' }]}, @@ -10253,25 +10629,25 @@ sub grading_menu { { linktext => 'Upload Scores', url => $url2, - permission => 'F', + permission => $permissions{'mgr'}, icon => 'uploadscores.png', linktitle => 'Specify a file containing the class scores for current resource.' }, { linktext => 'Process Clicker', url => $url3, - permission => 'F', + permission => $permissions{'mgr'}, icon => 'addClickerInfoFile.png', linktitle => 'Specify a file containing the clicker information for this resource.' }, { linktext => 'Grade/Manage/Review Bubblesheets', url => $url4, - permission => 'F', + permission => $permissions{'mgr'}, 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 => 'F', + permission => $permissions{'either'}, icon => 'receipt_number.png', linktitle => 'Verify a system-generated receipt number for correct problem solution.' } @@ -10336,11 +10712,30 @@ sub submit_options_download { my ($request,$symb) = @_; if (!$symb) {return '';} + my $res_error; + my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) = + &response_type($symb,\$res_error); + if ($res_error) { + $request->print(&mt('An error occurred retrieving response types')); + return; + } + unless ($numessay) { + $request->print(&mt('No essayresponse items found')); + return; + } + my $table; + if (ref($partlist) eq 'ARRAY') { + if (scalar(@$partlist) > 1 ) { + $table = &showResourceInfo($symb,$partlist,$responseType,'gradingMenu',1,1); + } + } + my $is_tool = ($symb =~ /ext\.tool$/); &commonJSfunctions($request); my $result='
'."\n". - ''."\n"; + $table."\n". + ''."\n"; $result.='

'.&mt('Select Students for whom to Download Submissions').' @@ -10387,6 +10782,14 @@ sub selectfield { (&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='
@@ -11118,7 +11521,7 @@ sub navmap_errormsg { } sub startpage { - my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js,$onload) = @_; + my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$head_extra,$onload,$divforres) = @_; my %args; if ($onload) { my %loaditems = ( @@ -11128,17 +11531,19 @@ sub startpage { } if ($nomenu) { $args{'only_body'} = 1; - $r->print(&Apache::loncommon::start_page("Student's Version",$js,\%args)); + $r->print(&Apache::loncommon::start_page("Student's Version",$head_extra,\%args)); } else { - unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"}); + if ($env{'request.course.id'}) { + unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"}); + } $args{'bread_crumbs'} = $crumbs; - $r->print(&Apache::loncommon::start_page('Grading',$js,\%args)); + $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)); + $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres)); } } @@ -11202,24 +11607,49 @@ sub handler { &select_problem($request); } else { if ($command eq 'submission' && $perm{'vgr'}) { - my ($stuvcurrent,$stuvdisp,$versionform,$js); + my ($stuvcurrent,$stuvdisp,$versionform,$js,$onload); if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) { ($stuvcurrent,$stuvdisp,$versionform,$js) = &choose_task_version_form($symb,$env{'form.student'}, $env{'form.userdom'}); } - &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,$stuvcurrent,$stuvdisp,undef,$js); + my $divforres; + if ($env{'form.student'} eq '') { + $js .= &part_selector_js(); + $onload = "toggleParts('gradesub');"; + } else { + $divforres = 1; + } + my $head_extra = $js; + unless ($env{'form.vProb'} eq 'no') { + my $csslinks = &Apache::loncommon::css_links($symb); + if ($csslinks) { + $head_extra .= "\n$csslinks"; + } + } + &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef, + $stuvcurrent,$stuvdisp,undef,$head_extra,$onload,$divforres); if ($versionform) { + if ($divforres) { + $request->print('
'); + } $request->print($versionform); } - $request->print('
'); - ($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb)); + ($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'}, $env{'form.userdom'}, $env{'form.inhibitmenu'}); - &startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef,$stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$js); + my $head_extra = $js; + unless ($env{'form.vProb'} eq 'no') { + my $csslinks = &Apache::loncommon::css_links($symb); + if ($csslinks) { + $head_extra .= "\n$csslinks"; + } + } + &startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef, + $stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$head_extra); if ($versionform) { $request->print($versionform); } @@ -11230,10 +11660,14 @@ sub handler { {href=>'',text=>'Select student'}],1,1); &pickStudentPage($request,$symb); } elsif ($command eq 'displayPage' && $perm{'vgr'}) { + my $csslinks; + unless ($env{'form.vProb'} eq 'no') { + $csslinks = &Apache::loncommon::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); + {href=>'',text=>'Grade student'}],1,1,undef,undef,undef,$csslinks); &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'}, @@ -11242,8 +11676,12 @@ sub handler { {href=>'',text=>'Store grades'}],1,1); &updateGradeByPage($request,$symb); } elsif ($command eq 'processGroup' && $perm{'vgr'}) { + my $csslinks; + unless ($env{'form.vProb'} eq 'no') { + $csslinks = &Apache::loncommon::css_links($symb); + } &startpage($request,$symb,[{href=>'',text=>'...'}, - {href=>'',text=>'Modify grades'}]); + {href=>'',text=>'Modify grades'}],undef,undef,undef,undef,undef,$csslinks,undef,1); &processGroup($request,$symb); } elsif ($command eq 'gradingmenu' && $perm{'vgr'}) { &startpage($request,$symb); @@ -11252,7 +11690,10 @@ sub handler { &startpage($request,$symb,[{href=>'',text=>'Select individual students to grade'}]); $request->print(&submit_options($request,$symb)); } elsif ($command eq 'ungraded' && $perm{'vgr'}) { - &startpage($request,$symb,[{href=>'',text=>'Grade ungraded submissions'}]); + my $js = &part_selector_js(); + my $onload = "toggleParts('gradesub');"; + &startpage($request,$symb,[{href=>'',text=>'Grade ungraded submissions'}], + undef,undef,undef,undef,undef,$js,$onload); $request->print(&listStudents($request,$symb,'graded')); } elsif ($command eq 'table' && $perm{'vgr'}) { &startpage($request,$symb,[{href=>"", text=>"Grading table"}]); @@ -11350,12 +11791,17 @@ sub handler { &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1); $request->print(&checkscantron_results($request,$symb)); } elsif ($command eq 'downloadfilesselect' && $perm{'vgr'}) { - &startpage($request,$symb,[{href=>'', text=>'Select which submissions to download'}]); + my $js = &part_selector_js(); + my $onload = "toggleParts('gradingMenu');"; + &startpage($request,$symb,[{href=>'', text=>'Select which submissions to download'}], + undef,undef,undef,undef,undef,$js,$onload); $request->print(&submit_options_download($request,$symb)); } elsif ($command eq 'downloadfileslink' && $perm{'vgr'}) { &startpage($request,$symb, [{href=>&href_symb_cmd($symb,'downloadfilesselect'), text=>'Select which submissions to download'}, - {href=>'', text=>'Download submitted files'}]); + {href=>'', text=>'Download submitted files'}], + undef,undef,undef,undef,undef,undef,undef,1); + $request->print('
'); &submit_download_link($request,$symb); } elsif ($command) { &startpage($request,$symb,[{href=>'', text=>'Access denied'}]); @@ -11535,8 +11981,8 @@ Side Effects: None. - missingbubble - array ref of the bubble lines that have missing bubble errors - $randomorder - True if exam folder has randomorder set - $randompick - True if exam folder has randompick set + $randomorder - True if exam folder (or a sub-folder) has randomorder set + $randompick - True if exam folder (or a sub-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).