Diff for /loncom/homework/grades.pm between versions 1.596.2.12.2.52 and 1.604

version 1.596.2.12.2.52, 2020/09/08 14:09:30 version 1.604, 2010/04/01 00:58:43
Line 40  use Apache::lonhomework; Line 40  use Apache::lonhomework;
 use Apache::lonpickcode;  use Apache::lonpickcode;
 use Apache::loncoursedata;  use Apache::loncoursedata;
 use Apache::lonmsg();  use Apache::lonmsg();
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common);
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonenc;  use Apache::lonenc;
 use Apache::lonstathelpers;  
 use Apache::bridgetask();  
 use Apache::lontexconvert();  
 use HTML::Parser();  
 use File::MMagic;  
 use String::Similarity;  use String::Similarity;
 use LONCAPA;  use LONCAPA;
   
Line 56  use POSIX qw(floor); Line 51  use POSIX qw(floor);
   
   
 my %perm=();  my %perm=();
 my %old_essays=();  
   
 #  These variables are used to recover from ssi errors  #  These variables are used to recover from ssi errors
   
Line 129  sub getpartlist { Line 123  sub getpartlist {
     return @stores;      return @stores;
 }  }
   
   # --- Get the symbolic name of a problem and the url
   # Generate an error message if symb could not be found unless silent flag is set
   # Takes $env{'form.symb'} by default; if not present, takes $env{'form.url'} and tries to get symb from that
   #
    
   sub get_symb {
       my ($request,$silent) = @_;
       (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
       my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
       if ($symb eq '') { 
    if (!$silent) {
       $request->print(&mt("Unable to handle ambiguous references: [_1].",$url));
       return ();
    }
       }
       &Apache::lonenc::check_decrypt(\$symb);
       return ($symb);
   }
   
 #--- Format fullname, username:domain if different for display  #--- Format fullname, username:domain if different for display
 #--- Use anywhere where the student names are listed  #--- Use anywhere where the student names are listed
 sub nameUserString {  sub nameUserString {
Line 143  sub nameUserString { Line 156  sub nameUserString {
   
 #--- Get the partlist and the response type for a given problem. ---  #--- Get the partlist and the response type for a given problem. ---
 #--- Indicate if a response type is coded handgraded or not. ---  #--- 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 {  sub response_type {
     my ($symb,$response_error) = @_;      my ($symb,$response_error) = @_;
   
Line 161  sub response_type { Line 172  sub response_type {
         return;          return;
     }      }
     my $partlist = $res->parts();      my $partlist = $res->parts();
     my ($numresp,$numessay,$numdropbox) = (0,0,0);  
     my %vPart =       my %vPart = 
  map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));   map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
     my (%response_types,%handgrade);      my (%response_types,%handgrade);
Line 171  sub response_type { Line 181  sub response_type {
  my @types = $res->responseType($part);   my @types = $res->responseType($part);
  my @ids = $res->responseIds($part);   my @ids = $res->responseIds($part);
  for (my $i=0; $i < scalar(@ids); $i++) {   for (my $i=0; $i < scalar(@ids); $i++) {
             $numresp ++;  
     $response_types{$part}{$ids[$i]} = $types[$i];      $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]} =       $handgrade{$part.'_'.$ids[$i]} = 
  &Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i].   &Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i].
      '.handgrade',$symb);       '.handgrade',$symb);
  }   }
     }      }
     return ($partlist,\%handgrade,\%response_types,$numresp,$numessay,$numdropbox);      return ($partlist,\%handgrade,\%response_types);
 }  }
   
 sub flatten_responseType {  sub flatten_responseType {
Line 211  sub get_display_part { Line 214  sub get_display_part {
     return $display;      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 '<br clear="all">';  
     }  
     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 '<br clear="all">';  
         }  
         if ($uploads) {  
             $coltitle = &mt('Problem Part Selected');  
         }  
     }  
     my $result = '<div class="LC_left_float" style="display:inline-block;">';  
     if ($checkboxes) {  
         my $legend = &mt('Parts to display');  
         if ($uploads) {  
             $legend = &mt('Part(s) with dropbox');  
         }  
         $result .= '<fieldset style="display:inline-block;"><legend>'.$legend.'</legend>'.  
                    '<span class="LC_nobreak">'.  
                    '<label><input type="radio" name="chooseparts" value="0" onclick="toggleParts('."'$formname'".');" checked="checked" />'.  
                    &mt('All parts').'</label>'.('&nbsp;'x2).  
                    '<label><input type="radio" name="chooseparts" value="1" onclick="toggleParts('."'$formname'".');" />'.  
                    &mt('Selected parts').'</label></span>'.  
                    '<div id="LC_partselector" style="display:none">';  
     }  
     $result .= &Apache::loncommon::start_data_table()  
               .&Apache::loncommon::start_data_table_header_row();  
     if ($checkboxes) {  
         $result .= '<th>'.&mt('Display?').'</th>';  
     }  
     $result .= '<th>'.$coltitle.'</th>'  
               .'<th>'.&mt('Res. ID').'</th>'  
               .'<th>'.&mt('Type').'</th>'  
               .&Apache::loncommon::end_data_table_header_row();  
     my %partsseen;  
     foreach my $partID (sort(keys(%$responseType))) {  
         foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {  
             my $responsetype = $responseType->{$partID}->{$resID};  
             if ($uploads) {  
                 next unless ($responsetype eq 'essay');  
                 next unless (&Apache::lonnet::EXT("resource.$partID".'_'."$resID.uploadedfiletypes",$symb));  
             }  
             my $display_part=&get_display_part($partID,$symb);  
             if (exists($partsseen{$partID})) {  
                 $result.=&Apache::loncommon::continue_data_table_row();  
             } else {  
                 $partsseen{$partID}=scalar(keys(%{$responseType->{$partID}}));  
                 $result.=&Apache::loncommon::start_data_table_row().  
                          '<td rowspan="'.$partsseen{$partID}.'" style="vertical-align:middle">';  
                 if ($checkboxes) {  
                     $result.='<input type="checkbox" name="vPart" checked="checked" value="'.$partID.'" /></td>'.  
                              '<td rowspan="'.$partsseen{$partID}.'" style="vertical-align:middle">'.$display_part.'</td>';  
                 } else {  
                     $result.=$display_part.'</td>';  
                 }  
             }  
             $result.='<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'  
                     .'<td>'.&mt($responsetype).'</td>'  
                     .&Apache::loncommon::end_data_table_row();  
         }  
     }  
     $result.=&Apache::loncommon::end_data_table();  
     if ($checkboxes) {  
         $result .= '</div></fieldset>';  
     }  
     $result .= '</div><div style="padding:0;clear:both;margin:0;border:0"></div>';  
     if (!keys(%partsseen)) {  
         $result = '';  
         if ($uploads) {  
             return '<div style="padding:0;clear:both;margin:0;border:0"></div>'.  
                    '<p class="LC_info">'.  
                     &mt('No dropbox items or essayresponse items with uploadedfiletypes set.').  
                    '</p>';  
         } else {  
             return '<br clear="all" />';  
         }  
     }    
     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<document.forms.length; i++) {  
                 if (document.forms[i].name == formname) {  
                     index = i;  
                     break;  
                 }  
             }  
         }  
         if ((index != '') && (document.forms[index].elements['chooseparts'].length > 1)) {  
             for (var i=0; i<document.forms[index].elements['chooseparts'].length; i++) {  
                 if (document.forms[index].elements['chooseparts'][i].checked) {  
                    var val = document.forms[index].elements['chooseparts'][i].value;  
                     if (document.forms[index].elements['chooseparts'][i].value == 1) {  
                         document.getElementById('LC_partselector').style.display = 'block';  
                     } else {  
                         document.getElementById('LC_partselector').style.display = 'none';  
                     }  
                 }  
             }  
         }  
     }  
 }  
 END  
     return &Apache::lonhtmlcommon::scripttag($js);  
 }  
   
 sub reset_caches {  sub reset_caches {
     &reset_analyze_cache();      &reset_analyze_cache();
     &reset_perm();      &reset_perm();
     &reset_old_essays();  
 }  }
   
 {  {
Line 350  sub reset_caches { Line 229  sub reset_caches {
     }      }
   
     sub get_analyze {      sub get_analyze {
  my ($symb,$uname,$udom,$no_increment,$add_to_hash,$type,$trial,$rndseed,$bubbles_per_row)=@_;   my ($symb,$uname,$udom,$no_increment,$add_to_hash)=@_;
  my $key = "$symb\0$uname\0$udom";   my $key = "$symb\0$uname\0$udom";
         if ($type eq 'randomizetry') {  
             if ($trial ne '') {  
                 $key .= "\0".$trial;  
             }  
         }  
  if (exists($analyze_cache{$key})) {   if (exists($analyze_cache{$key})) {
             my $getupdate = 0;              my $getupdate = 0;
             if (ref($add_to_hash) eq 'HASH') {              if (ref($add_to_hash) eq 'HASH') {
Line 384  sub reset_caches { Line 258  sub reset_caches {
                     'grade_courseid'    =>  $env{'request.course.id'},                      'grade_courseid'    =>  $env{'request.course.id'},
                     'grade_username'    => $uname,                      'grade_username'    => $uname,
                     'grade_noincrement' => $no_increment);                      'grade_noincrement' => $no_increment);
         if ($bubbles_per_row ne '') {  
             $form{'bubbles_per_row'} = $bubbles_per_row;  
         }  
         if ($type eq 'randomizetry') {  
             $form{'grade_questiontype'} = $type;  
             if ($rndseed ne '') {  
                 $form{'grade_rndseed'} = $rndseed;  
             }  
         }  
         if (ref($add_to_hash)) {          if (ref($add_to_hash)) {
             %form = (%form,%{$add_to_hash});              %form = (%form,%{$add_to_hash});
         }          } 
  my $subresult=&ssi_with_retries($url, $ssi_retries,%form);   my $subresult=&ssi_with_retries($url, $ssi_retries,%form);
  (undef,$subresult)=split(/_HASH_REF__/,$subresult,2);   (undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
  my %analyze=&Apache::lonnet::str2hash($subresult);   my %analyze=&Apache::lonnet::str2hash($subresult);
Line 408  sub reset_caches { Line 273  sub reset_caches {
     }      }
   
     sub get_order {      sub get_order {
  my ($partid,$respid,$symb,$uname,$udom,$no_increment,$type,$trial,$rndseed)=@_;   my ($partid,$respid,$symb,$uname,$udom,$no_increment)=@_;
  my $analyze = &get_analyze($symb,$uname,$udom,$no_increment,undef,$type,$trial,$rndseed);   my $analyze = &get_analyze($symb,$uname,$udom,$no_increment);
  return $analyze->{"$partid.$respid.shown"};   return $analyze->{"$partid.$respid.shown"};
     }      }
   
     sub get_radiobutton_correct_foil {      sub get_radiobutton_correct_foil {
  my ($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed)=@_;   my ($partid,$respid,$symb,$uname,$udom)=@_;
  my $analyze = &get_analyze($symb,$uname,$udom,undef,undef,$type,$trial,$rndseed);   my $analyze = &get_analyze($symb,$uname,$udom);
         my $foils = &get_order($partid,$respid,$symb,$uname,$udom,undef,$type,$trial,$rndseed);          my $foils = &get_order($partid,$respid,$symb,$uname,$udom);
         if (ref($foils) eq 'ARRAY') {          if (ref($foils) eq 'ARRAY') {
     foreach my $foil (@{$foils}) {      foreach my $foil (@{$foils}) {
         if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {          if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
Line 427  sub reset_caches { Line 292  sub reset_caches {
     }      }
   
     sub scantron_partids_tograde {      sub scantron_partids_tograde {
         my ($resource,$cid,$uname,$udom,$check_for_randomlist,$bubbles_per_row,$scancode) = @_;          my ($resource,$cid,$uname,$udom,$check_for_randomlist) = @_;
         my (%analysis,@parts);          my (%analysis,@parts);
         if (ref($resource)) {          if (ref($resource)) {
             my $symb = $resource->symb();              my $symb = $resource->symb();
Line 435  sub reset_caches { Line 300  sub reset_caches {
             if ($check_for_randomlist) {              if ($check_for_randomlist) {
                 $add_to_form = { 'check_parts_withrandomlist' => 1,};                  $add_to_form = { 'check_parts_withrandomlist' => 1,};
             }              }
             if ($scancode) {              my $analyze = &get_analyze($symb,$uname,$udom,undef,$add_to_form);
                 if (ref($add_to_form) eq 'HASH') {  
                     $add_to_form->{'code_for_randomlist'} = $scancode;  
                 } else {  
                     $add_to_form = { 'code_for_randomlist' => $scancode,};  
                 }  
             }  
             my $analyze =  
                 &get_analyze($symb,$uname,$udom,undef,$add_to_form,  
                              undef,undef,undef,$bubbles_per_row);  
             if (ref($analyze) eq 'HASH') {              if (ref($analyze) eq 'HASH') {
                 %analysis = %{$analyze};                  %analysis = %{$analyze};
             }              }
Line 467  sub reset_caches { Line 323  sub reset_caches {
 #        response types only.  #        response types only.
 sub cleanRecord {  sub cleanRecord {
     my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,      my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,
  $uname,$udom,$type,$trial,$rndseed) = @_;   $uname,$udom) = @_;
     my $grayFont = '<span class="LC_internal_info">';      my $grayFont = '<span class="LC_internal_info">';
     if ($response =~ /^(option|rank)$/) {      if ($response =~ /^(option|rank)$/) {
  my %answer=&Apache::lonnet::str2hash($answer);   my %answer=&Apache::lonnet::str2hash($answer);
         my @answer = %answer;  
         %answer = map {&HTML::Entities::encode($_, '"<>&')} @answer;  
  my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});   my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
  my ($toprow,$bottomrow);   my ($toprow,$bottomrow);
  foreach my $foil (@$order) {   foreach my $foil (@$order) {
Line 486  sub cleanRecord { Line 340  sub cleanRecord {
  return '<blockquote><table border="1">'.   return '<blockquote><table border="1">'.
     '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.      '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
     '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.      '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
     $bottomrow.'</tr></table></blockquote>';      $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
     } elsif ($response eq 'match') {      } elsif ($response eq 'match') {
  my %answer=&Apache::lonnet::str2hash($answer);   my %answer=&Apache::lonnet::str2hash($answer);
         my @answer = %answer;  
         %answer = map {&HTML::Entities::encode($_, '"<>&')} @answer;  
  my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});   my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
  my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});   my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});
  my ($toprow,$middlerow,$bottomrow);   my ($toprow,$middlerow,$bottomrow);
Line 510  sub cleanRecord { Line 362  sub cleanRecord {
     '<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.      '<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.
     $middlerow.'</tr>'.      $middlerow.'</tr>'.
     '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.      '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
     $bottomrow.'</tr></table></blockquote>';      $bottomrow.'</tr>'.'</table></blockquote>';
     } elsif ($response eq 'radiobutton') {      } elsif ($response eq 'radiobutton') {
  my %answer=&Apache::lonnet::str2hash($answer);   my %answer=&Apache::lonnet::str2hash($answer);
         my @answer = %answer;  
         %answer = map {&HTML::Entities::encode($_, '"<>&')}  @answer;  
  my ($toprow,$bottomrow);   my ($toprow,$bottomrow);
  my $correct =    my $correct = 
     &get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed);      &get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom);
  foreach my $foil (@$order) {   foreach my $foil (@$order) {
     if (exists($answer{$foil})) {      if (exists($answer{$foil})) {
  if ($foil eq $correct) {   if ($foil eq $correct) {
Line 533  sub cleanRecord { Line 383  sub cleanRecord {
  return '<blockquote><table border="1">'.   return '<blockquote><table border="1">'.
     '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.      '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
     '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.      '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
     $bottomrow.'</tr></table></blockquote>';      $bottomrow.'</tr>'.'</table></blockquote>';
     } elsif ($response eq 'essay') {      } elsif ($response eq 'essay') {
  if (! exists ($env{'form.'.$symb})) {   if (! exists ($env{'form.'.$symb})) {
     my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',      my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
Line 547  sub cleanRecord { Line 397  sub cleanRecord {
     $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';      $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
     $env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.      $env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
  }   }
         $answer = &Apache::lontexconvert::msgtexconverted($answer);   $answer =~ s-\n-<br />-g;
  return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';   return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
     } elsif ( $response eq 'organic') {      } elsif ( $response eq 'organic') {
         my $result=&mt('Smile representation: [_1]',   my $result='Smile representation: "<tt>'.$answer.'</tt>"';
                            '"<tt>'.&HTML::Entities::encode($answer, '"<>&').'</tt>"');  
  my $jme=$record->{$version."resource.$partid.$respid.molecule"};   my $jme=$record->{$version."resource.$partid.$respid.molecule"};
  $result.=&Apache::chemresponse::jme_img($jme,$answer,400);   $result.=&Apache::chemresponse::jme_img($jme,$answer,400);
  return $result;   return $result;
Line 585  sub cleanRecord { Line 434  sub cleanRecord {
     $result.='</ul>';      $result.='</ul>';
     return $result;      return $result;
  }   }
     } elsif ( $response =~ m/(?:numerical|formula|custom)/) {      } elsif ( $response =~ m/(?:numerical|formula)/) {
         # Respect multiple input fields, see Bug #5409   
  $answer =    $answer = 
     &Apache::loncommon::format_previous_attempt_value('submission',      &Apache::loncommon::format_previous_attempt_value('submission',
       $answer);        $answer);
  return $answer;  
     }      }
     return &HTML::Entities::encode($answer, '"<>&');      return $answer;
 }  }
   
 #-- A couple of common js functions  #-- A couple of common js functions
Line 632  COMMONJSFUNCTIONS Line 479  COMMONJSFUNCTIONS
 #--- Dumps the class list with usernames,list of sections,  #--- Dumps the class list with usernames,list of sections,
 #--- section, ids and fullnames for each user.  #--- section, ids and fullnames for each user.
 sub getclasslist {  sub getclasslist {
     my ($getsec,$filterbyaccstatus,$getgroup,$symb,$submitonly,$filterbysubmstatus) = @_;      my ($getsec,$filterlist,$getgroup) = @_;
     my @getsec;      my @getsec;
     my @getgroup;      my @getgroup;
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));      my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
Line 660  sub getclasslist { Line 507  sub getclasslist {
     #      #
     my %sections;      my %sections;
     my %fullnames;      my %fullnames;
     my ($cdom,$cnum,$partlist);  
     if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) {  
         $cdom = $env{"course.$env{'request.course.id'}.domain"};  
         $cnum = $env{"course.$env{'request.course.id'}.num"};  
         my $res_error;  
         ($partlist) = &response_type($symb,\$res_error);  
     }  
     foreach my $student (keys(%$classlist)) {      foreach my $student (keys(%$classlist)) {
         my $end      =           my $end      = 
             $classlist->{$student}->[&Apache::loncoursedata::CL_END()];              $classlist->{$student}->[&Apache::loncoursedata::CL_END()];
Line 683  sub getclasslist { Line 523  sub getclasslist {
         my $group   =           my $group   = 
             $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];              $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
  # filter students according to status selected   # filter students according to status selected
  if ($filterbyaccstatus && (!($stu_status =~ /Any/))) {   if ($filterlist && (!($stu_status =~ /Any/))) {
     if (!($stu_status =~ $status)) {      if (!($stu_status =~ $status)) {
  delete($classlist->{$student});   delete($classlist->{$student});
  next;   next;
Line 700  sub getclasslist { Line 540  sub getclasslist {
                }                  } 
         }          }
            if (($grp eq 'none') && !$group) {             if (($grp eq 'none') && !$group) {
            $exclude = 0;                 $exclude = 0;
         }          }
     }      }
     if ($exclude) {      if ($exclude) {
         delete($classlist->{$student});          delete($classlist->{$student});
  next;  
     }      }
  }   }
         if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) {  
             my $udom =  
                 $classlist->{$student}->[&Apache::loncoursedata::CL_SDOM()];  
             my $uname =  
                 $classlist->{$student}->[&Apache::loncoursedata::CL_SNAME()];  
             if (($symb ne '') && ($udom ne '') && ($uname ne '')) {  
                 if ($submitonly eq 'queued') {  
                     my %queue_status =  
                         &Apache::bridgetask::get_student_status($symb,$cdom,$cnum,  
                                                                 $udom,$uname);  
                     if (!defined($queue_status{'gradingqueue'})) {  
                         delete($classlist->{$student});  
                         next;  
                     }  
                 } else {  
                     my (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);  
                     my $submitted = 0;  
                     my $graded = 0;  
                     my $incorrect = 0;  
                     foreach (keys(%status)) {  
                         $submitted = 1 if ($status{$_} ne 'nothing');  
                         $graded = 1 if ($status{$_} =~ /^ungraded/);  
                         $incorrect = 1 if ($status{$_} =~ /^incorrect/);  
   
                         my ($foo,$partid,$foo1) = split(/\./,$_);  
                         if ($status{'resource.'.$partid.'.submitted_by'} ne '') {  
                             $submitted = 0;  
                         }  
                     }  
                     if (!$submitted && ($submitonly eq 'yes' ||  
                                         $submitonly eq 'incorrect' ||  
                                         $submitonly eq 'graded')) {  
                         delete($classlist->{$student});  
                         next;  
                     } elsif (!$graded && ($submitonly eq 'graded')) {  
                         delete($classlist->{$student});  
                         next;  
                     } elsif (!$incorrect && $submitonly eq 'incorrect') {  
                         delete($classlist->{$student});  
                         next;  
                     }  
                 }  
             }  
         }  
  $section = ($section ne '' ? $section : 'none');   $section = ($section ne '' ? $section : 'none');
  if (&canview($section)) {   if (&canview($section)) {
     if (!@getsec || grep(/^\Q$section\E$/,@getsec)) {      if (!@getsec || grep(/^\Q$section\E$/,@getsec)) {
Line 766  sub getclasslist { Line 561  sub getclasslist {
     delete($classlist->{$student});      delete($classlist->{$student});
  }   }
     }      }
       my %seen = ();
     my @sections = sort(keys(%sections));      my @sections = sort(keys(%sections));
     return ($classlist,\@sections,\%fullnames);      return ($classlist,\@sections,\%fullnames);
 }  }
Line 781  sub canmodify { Line 577  sub canmodify {
  #can modify the requested section   #can modify the requested section
  return 1;   return 1;
     } else {      } else {
  # can't modify the requested section   # can't modify the request section
  return 0;   return 0;
     }      }
  }   }
Line 794  sub canview { Line 590  sub canview {
     my ($sec)=@_;      my ($sec)=@_;
     if ($perm{'vgr'}) {      if ($perm{'vgr'}) {
  if (!defined($perm{'vgr_section'})) {   if (!defined($perm{'vgr_section'})) {
     # can view whole class      # can modify whole class
     return 1;      return 1;
  } else {   } else {
     if ($sec eq $perm{'vgr_section'}) {      if ($sec eq $perm{'vgr_section'}) {
  #can view the requested section   #can modify the requested section
  return 1;   return 1;
     } else {      } else {
  # can't view the requested section   # can't modify the request section
  return 0;   return 0;
     }      }
  }   }
     }      }
     #can't view      #can't modify
     return 0;      return 0;
 }  }
   
Line 840  sub jscriptNform { Line 636  sub jscriptNform {
  "\n");   "\n");
     $jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".      $jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".
  '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".   '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
    '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
    '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
  '<input type="hidden" name="Status"  value="'.$stu_status.'" />'."\n".   '<input type="hidden" name="Status"  value="'.$stu_status.'" />'."\n".
  '<input type="hidden" name="command" value="submission" />'."\n".   '<input type="hidden" name="command" value="submission" />'."\n".
  '<input type="hidden" name="student" value="" />'."\n".   '<input type="hidden" name="student" value="" />'."\n".
Line 884  sub compute_points { Line 682  sub compute_points {
 #  #
   
 sub most_similar {  sub most_similar {
     my ($uname,$udom,$symb,$uessay)=@_;      my ($uname,$udom,$uessay,$old_essays)=@_;
   
     unless ($symb) { return ''; }  
   
     unless (ref($old_essays{$symb}) eq 'HASH') { return ''; }  
   
 # ignore spaces and punctuation  # ignore spaces and punctuation
   
Line 905  sub most_similar { Line 699  sub most_similar {
     my $scrsid='';      my $scrsid='';
     my $sessay='';      my $sessay='';
 # go through all essays ...  # go through all essays ...
     foreach my $tkey (keys(%{$old_essays{$symb}})) {      foreach my $tkey (keys(%$old_essays)) {
  my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey));   my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey));
 # ... except the same student  # ... except the same student
         next if (($tname eq $uname) && ($tdom eq $udom));          next if (($tname eq $uname) && ($tdom eq $udom));
  my $tessay=$old_essays{$symb}{$tkey};   my $tessay=$old_essays->{$tkey};
  $tessay=~s/\W+/ /gs;   $tessay=~s/\W+/ /gs;
 # String similarity gives up if not even limit  # String similarity gives up if not even limit
  my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit);   my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit);
Line 919  sub most_similar { Line 713  sub most_similar {
     $sname=$tname;      $sname=$tname;
     $sdom=$tdom;      $sdom=$tdom;
     $scrsid=$tcrsid;      $scrsid=$tcrsid;
     $sessay=$old_essays{$symb}{$tkey};      $sessay=$old_essays->{$tkey};
  }   }
     }      }
     if ($limit>0.6) {      if ($limit>0.6) {
Line 935  sub most_similar { Line 729  sub most_similar {
 #  #
   
 sub initialverifyreceipt {  sub initialverifyreceipt {
    my ($request,$symb) = @_;     my $request = shift;
    &commonJSfunctions($request);     &commonJSfunctions($request);
    return '<form name="gradingMenu" action=""><input type="submit" value="'.&mt('Verify Receipt Number.').'" />'.     my ($symb)   = &get_symb($request);
      return '<form name="gradingMenu"><input type="submit" value="'.&mt('Verify Receipt No.').'" />'.
         &Apache::lonnet::recprefix($env{'request.course.id'}).          &Apache::lonnet::recprefix($env{'request.course.id'}).
         '-<input type="text" name="receipt" size="4" />'.          '-<input type="text" name="receipt" size="4" />'.
         '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".          '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
Line 947  sub initialverifyreceipt { Line 742  sub initialverifyreceipt {
   
 #--- Check whether a receipt number is valid.---  #--- Check whether a receipt number is valid.---
 sub verifyreceipt {  sub verifyreceipt {
     my ($request,$symb) = @_;      my $request  = shift;
   
     my $courseid = $env{'request.course.id'};      my $courseid = $env{'request.course.id'};
     my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.      my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.
  $env{'form.receipt'};   $env{'form.receipt'};
     $receipt     =~ s/[^\-\d]//g;      $receipt     =~ s/[^\-\d]//g;
       my ($symb)   = &get_symb($request);
   
     my $title =      my $title.=
  '<h3><span class="LC_info">'.   '<h3><span class="LC_info">'.
  &mt('Verifying Receipt Number [_1]',$receipt).   &mt('Verifying Receipt No. [_1]',$receipt).
  '</span></h3>'."\n";   '</span></h3>'."\n".
    '<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
    '</h4>'."\n";
   
     my ($string,$contents,$matches) = ('','',0);      my ($string,$contents,$matches) = ('','',0);
     my (undef,undef,$fullname) = &getclasslist('all','0');      my (undef,undef,$fullname) = &getclasslist('all','0');
Line 1027  sub verifyreceipt { Line 825  sub verifyreceipt {
     $contents.      $contents.
     &Apache::loncommon::end_data_table()."\n";      &Apache::loncommon::end_data_table()."\n";
     }      }
     return $string;      return $string.&show_grading_menu_form($symb);
 }  }
   
 #--- This is called by a number of programs.  #--- This is called by a number of programs.
Line 1035  sub verifyreceipt { Line 833  sub verifyreceipt {
 #--- Also called directly when one clicks on the subm button   #--- Also called directly when one clicks on the subm button 
 #    on the problem page.  #    on the problem page.
 sub listStudents {  sub listStudents {
     my ($request,$symb,$submitonly,$divforres) = @_;      my ($request) = shift;
   
       my ($symb) = &get_symb($request);
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};      my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};      my $cnum      = $env{"course.$env{'request.course.id'}.num"};
     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};      my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
     my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};      my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
     unless ($submitonly) {      my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
         $submitonly = $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};      my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
     }      $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
    &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
     my $result='';  
     my $res_error;      my $result='<h3><span class="LC_info">&nbsp;'
     my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error);   .&mt("$viewgrade Submissions for a Student or a Group of Students")
    .'</span></h3>';
   
     my $table;      my ($partlist,$handgrade,$responseType) = &response_type($symb
     if (ref($partlist) eq 'ARRAY') {  #,$res_error
         if (scalar(@$partlist) > 1 ) {      );
             $table = &showResourceInfo($symb,$partlist,$responseType,'gradesub',1);  
         } elsif ($divforres) {  
             $table = '<div style="padding:0;clear:both;margin:0;border:0"></div>';  
         } else {  
             $table = '<br clear="all" />';  
         }  
     }  
   
     my %js_lt = &Apache::lonlocal::texthash (      my %lt = &Apache::lonlocal::texthash (
  'multiple' => 'Please select a student or group of students before clicking on the Next button.',   'multiple' => 'Please select a student or group of students before clicking on the Next button.',
  'single'   => 'Please select the student before clicking on the Next button.',   'single'   => 'Please select the student before clicking on the Next button.',
      );       );
     &js_escape(\%js_lt);  
     $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));      $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
     function checkSelect(checkBox) {      function checkSelect(checkBox) {
  var ctr=0;   var ctr=0;
Line 1075  sub listStudents { Line 867  sub listStudents {
     ctr++;      ctr++;
  }   }
     }      }
     sense = '$js_lt{'multiple'}';      sense = '$lt{'multiple'}';
  } else {   } else {
     if (checkBox.checked) {      if (checkBox.checked) {
  ctr = 1;   ctr = 1;
     }      }
     sense = '$js_lt{'single'}';      sense = '$lt{'single'}';
  }   }
  if (ctr == 0) {   if (ctr == 0) {
     alert(sense);      alert(sense);
Line 1099  LISTJAVASCRIPT Line 891  LISTJAVASCRIPT
     &commonJSfunctions($request);      &commonJSfunctions($request);
     $request->print($result);      $request->print($result);
   
       my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
       my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.      my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
  "\n".$table;   "\n";
   
     $gradeTable .= &Apache::lonhtmlcommon::start_pick_box();      $gradeTable .= &Apache::lonhtmlcommon::start_pick_box();
     $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))      $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
                   .'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n"                    .'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n"
Line 1114  LISTJAVASCRIPT Line 908  LISTJAVASCRIPT
                   .'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n"                    .'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n"
                   .&Apache::lonhtmlcommon::row_closure();                    .&Apache::lonhtmlcommon::row_closure();
   
       my $submission_options;
       if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
    $submission_options.=
       '<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> '.&mt('essay part only').' </label>'."\n";
       }
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));      my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
     my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;      my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
     $env{'form.Status'} = $saveStatus;      $env{'form.Status'} = $saveStatus;
     my %optiontext = &Apache::lonlocal::texthash (      $submission_options.=
                           lastonly => 'last submission',  
                           last     => 'last submission with details',  
                           datesub  => 'all submissions',  
                           all      => 'all submissions with details',  
                       );  
     my $submission_options =  
         '<span class="LC_nobreak">'.          '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="lastonly" /> '.          '<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.
         $optiontext{'lastonly'}.' </label></span>'."\n".          &mt('last submission only').' </label></span>'."\n".
         '<span class="LC_nobreak">'.          '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="last" /> '.          '<label><input type="radio" name="lastSub" value="last" /> '.
         $optiontext{'last'}.' </label></span>'."\n".          &mt('last submission &amp; parts info').' </label></span>'."\n".
         '<span class="LC_nobreak">'.          '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.          '<label><input type="radio" name="lastSub" value="datesub" /> '.
         $optiontext{'datesub'}.'</label></span>'."\n".          &mt('by dates and submissions').'</label></span>'."\n".
         '<span class="LC_nobreak">'.          '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="all" /> '.          '<label><input type="radio" name="lastSub" value="all" /> '.
         $optiontext{'all'}.'</label></span>';          &mt('all details').'</label></span>';
     my ($compmsg,$nocompmsg);  
     $nocompmsg = ' checked="checked"';  
     if ($numessay) {  
         $compmsg = $nocompmsg;  
         $nocompmsg = '';  
     }  
     $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))      $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
                   .$submission_options                    .$submission_options
                   .&Apache::lonhtmlcommon::row_closure()  
                   .&Apache::lonhtmlcommon::row_title(&mt('Send Messages'))  
                   .'<span class="LC_nobreak">'  
                   .'<label><input type="radio" name="compmsg" value="0"'.$nocompmsg.' />'  
                   .&mt('No').('&nbsp;'x2).'</label>'  
                   .'<label><input type="radio" name="compmsg" value="1"'.$compmsg.' />'  
                   .&mt('Yes').('&nbsp;'x2).'</label>'  
                   .&Apache::lonhtmlcommon::row_closure();                    .&Apache::lonhtmlcommon::row_closure();
   
     $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))      $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
Line 1159  LISTJAVASCRIPT Line 939  LISTJAVASCRIPT
                   .'<option value=".5">'.&mt('Half Points').'</option>'                    .'<option value=".5">'.&mt('Half Points').'</option>'
                   .'<option value=".25">'.&mt('Quarter Points').'</option>'                    .'<option value=".25">'.&mt('Quarter Points').'</option>'
                   .'<option value=".1">'.&mt('Tenths of a Point').'</option>'                    .'<option value=".1">'.&mt('Tenths of a Point').'</option>'
                   .'</select>';                    .'</select>'
                     .&Apache::lonhtmlcommon::row_closure();
   
     $gradeTable .=       $gradeTable .= 
         &build_section_inputs().          &build_section_inputs().
  '<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".   '<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
    '<input type="hidden" name="handgrade"   value="'.$env{'form.handgrade'}.'" /><br />'."\n".
    '<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".
    '<input type="hidden" name="saveState"   value="'.$env{'form.saveState'}.'" />'."\n".
    '<input type="hidden" name="probTitle"   value="'.$env{'form.probTitle'}.'" />'."\n".
  '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".   '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
  '<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";   '<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
     if (exists($env{'form.Status'})) {  
       if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
  $gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";   $gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
     } else {      } else {
         $gradeTable .= &Apache::lonhtmlcommon::row_closure()          $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
                       .&Apache::lonhtmlcommon::row_title(&mt('Student Status'))  
                       .&Apache::lonhtmlcommon::StatusOptions(                        .&Apache::lonhtmlcommon::StatusOptions(
                            $saveStatus,undef,1,'javascript:reLoadList(this.form);');                             $saveStatus,undef,1,'javascript:reLoadList(this.form);')
                         .&Apache::lonhtmlcommon::row_closure();
     }      }
     if ($numessay) {  
         $gradeTable .= &Apache::lonhtmlcommon::row_closure()      $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
                       .&Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))                    .'<input type="checkbox" name="checkPlag" checked="checked" />'
                       .'<input type="checkbox" name="checkPlag" checked="checked" />';                    .&Apache::lonhtmlcommon::row_closure(1)
     }  
     $gradeTable .= &Apache::lonhtmlcommon::row_closure(1)  
                   .&Apache::lonhtmlcommon::end_pick_box();                    .&Apache::lonhtmlcommon::end_pick_box();
   
     $gradeTable .= '<p>'      $gradeTable .= '<p>'
                   .&mt("To view/grade/regrade a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.")."\n"                    .&mt('To '.lc($viewgrade)." a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.")."\n"
                   .'<input type="hidden" name="command" value="processGroup" />'                    .'<input type="hidden" name="command" value="processGroup" />'
                   .'</p>';                    .'</p>';
   
Line 1199  LISTJAVASCRIPT Line 984  LISTJAVASCRIPT
     while ($loop < 2) {      while ($loop < 2) {
  $gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.   $gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.
     '<th>'.&nameUserString('header').'&nbsp;'.&mt('Section/Group').'</th>';      '<th>'.&nameUserString('header').'&nbsp;'.&mt('Section/Group').'</th>';
  if (($submitonly ne 'queued') && ($submitonly ne 'all')) {   if ($env{'form.showgrading'} eq 'yes' 
       && $submitonly ne 'queued'
       && $submitonly ne 'all') {
     foreach my $part (sort(@$partlist)) {      foreach my $part (sort(@$partlist)) {
  my $display_part=   my $display_part=
     &get_display_part((split(/_/,$part))[0],$symb);      &get_display_part((split(/_/,$part))[0],$symb);
Line 1235  LISTJAVASCRIPT Line 1022  LISTJAVASCRIPT
     $status{'gradingqueue'} = $queue_status{'gradingqueue'};      $status{'gradingqueue'} = $queue_status{'gradingqueue'};
  }   }
   
  if (($submitonly ne 'queued') && ($submitonly ne 'all')) {   if ($env{'form.showgrading'} eq 'yes' 
       && $submitonly ne 'queued'
       && $submitonly ne 'all') {
     (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);      (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
     my $submitted = 0;      my $submitted = 0;
     my $graded = 0;      my $graded = 0;
Line 1276  LISTJAVASCRIPT Line 1065  LISTJAVASCRIPT
        &nameUserString(undef,$$fullname{$student},$uname,$udom).         &nameUserString(undef,$$fullname{$student},$uname,$udom).
        '&nbsp;'.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";         '&nbsp;'.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";
   
     if ($submitonly ne 'all') {      if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
  foreach (sort(keys(%status))) {   foreach (sort(keys(%status))) {
     next if ($_ =~ /^resource.*?submitted_by$/);      next if ($_ =~ /^resource.*?submitted_by$/);
     $gradeTable.='<td align="center">&nbsp;'.&mt($status{$_}).'&nbsp;</td>'."\n";      $gradeTable.='<td align="center">&nbsp;'.&mt($status{$_}).'&nbsp;</td>'."\n";
Line 1290  LISTJAVASCRIPT Line 1079  LISTJAVASCRIPT
     }      }
     if ($ctr%2 ==1) {      if ($ctr%2 ==1) {
  $gradeTable.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>';   $gradeTable.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>';
     if (($submitonly ne 'queued') && ($submitonly ne 'all')) {      if ($env{'form.showgrading'} eq 'yes' 
    && $submitonly ne 'queued'
    && $submitonly ne 'all') {
  foreach (@$partlist) {   foreach (@$partlist) {
     $gradeTable.='<td>&nbsp;</td>';      $gradeTable.='<td>&nbsp;</td>';
  }   }
Line 1314  LISTJAVASCRIPT Line 1105  LISTJAVASCRIPT
     if ($submitonly eq 'graded'   ) { $submissions = 'ungraded submissions'; }      if ($submitonly eq 'graded'   ) { $submissions = 'ungraded submissions'; }
     if ($submitonly eq 'queued'   ) { $submissions = 'queued submissions'; }      if ($submitonly eq 'queued'   ) { $submissions = 'queued submissions'; }
     $gradeTable='<br />&nbsp;<span class="LC_warning">'.      $gradeTable='<br />&nbsp;<span class="LC_warning">'.
  &mt('No '.$submissions.' found for this resource for any students. ([quant,_1,student] checked for '.$submissions.')',   &mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')',
     $num_students).      $num_students).
  '</span><br />';   '</span><br />';
  }   }
     } elsif ($ctr == 1) {      } elsif ($ctr == 1) {
  $gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/;   $gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/;
     }      }
       $gradeTable.=&show_grading_menu_form($symb);
     $request->print($gradeTable);      $request->print($gradeTable);
     return '';      return '';
 }  }
Line 1328  LISTJAVASCRIPT Line 1120  LISTJAVASCRIPT
 #---- Called from the listStudents routine  #---- Called from the listStudents routine
   
 sub check_script {  sub check_script {
     my ($form,$type) = @_;      my ($form, $type)=@_;
     my $chkallscript = &Apache::lonhtmlcommon::scripttag('      my $chkallscript= &Apache::lonhtmlcommon::scripttag('
     function checkall() {      function checkall() {
         for (i=0; i<document.forms.'.$form.'.elements.length; i++) {          for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
             ele = document.forms.'.$form.'.elements[i];              ele = document.forms.'.$form.'.elements[i];
Line 1374  sub check_buttons { Line 1166  sub check_buttons {
   
 #     Displays the submissions for one student or a group of students  #     Displays the submissions for one student or a group of students
 sub processGroup {  sub processGroup {
     my ($request,$symb) = @_;      my ($request)  = shift;
     my $ctr        = 0;      my $ctr        = 0;
     my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');      my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
     my $total      = scalar(@stuchecked)-1;      my $total      = scalar(@stuchecked)-1;
Line 1384  sub processGroup { Line 1176  sub processGroup {
  $env{'form.student'}        = $uname;   $env{'form.student'}        = $uname;
  $env{'form.userdom'}        = $udom;   $env{'form.userdom'}        = $udom;
  $env{'form.fullname'}       = $fullname;   $env{'form.fullname'}       = $fullname;
  &submission($request,$ctr,$total,$symb);   &submission($request,$ctr,$total);
  $ctr++;   $ctr++;
     }      }
     return '';      return '';
Line 1398  sub processGroup { Line 1190  sub processGroup {
 #--- Javascript to handle the submission page functionality ---  #--- Javascript to handle the submission page functionality ---
 sub sub_page_js {  sub sub_page_js {
     my $request = shift;      my $request = shift;
     my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');      my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
     &js_escape(\$alertmsg);  
     $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));      $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
     function updateRadio(formname,id,weight) {      function updateRadio(formname,id,weight) {
  var gradeBox = formname["GD_BOX"+id];   var gradeBox = formname["GD_BOX"+id];
Line 1517  sub sub_page_js { Line 1308  sub sub_page_js {
     }      }
  }   }
     }      }
       
  }   }
     }      }
       
    }
    if (val == "Grade Student") {
       formname.showgrading.value = "yes";
       if (formname.Status.value == "") {
    formname.Status.value = "Active";
       }
       formname.studentNo.value = total;
  }   }
  formname.submit();   formname.submit();
     }      }
Line 1562  sub sub_page_js { Line 1362  sub sub_page_js {
 SUBJAVASCRIPT  SUBJAVASCRIPT
 }  }
   
 #--- javascript for grading message center  #--- javascript for essay type problem --
 sub sub_grademessage_js {  sub sub_page_kw_js {
     my $request = shift;      my $request = shift;
     my $iconpath = $request->dir_config('lonIconsURL');      my $iconpath = $request->dir_config('lonIconsURL');
     &commonJSfunctions($request);      &commonJSfunctions($request);
   
     my $inner_js_msg_central= (<<INNERJS);      my $inner_js_msg_central= &Apache::lonhtmlcommon::scripttag(<<INNERJS);
 <script type="text/javascript">  
     function checkInput() {      function checkInput() {
       opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);        opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);
       var nmsg   = opener.document.SCORE.savemsgN.value;        var nmsg   = opener.document.SCORE.savemsgN.value;
Line 1606  sub sub_grademessage_js { Line 1405  sub sub_grademessage_js {
       self.close()        self.close()
   
     }      }
 </script>  
 INNERJS  INNERJS
   
     my $start_page_msg_central =      my $inner_js_highlight_central= &Apache::lonhtmlcommon::scripttag(<<INNERJS);
       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 = 
         &Apache::loncommon::start_page('Message Central',$inner_js_msg_central,          &Apache::loncommon::start_page('Message Central',$inner_js_msg_central,
        {'js_ready'  => 1,         {'js_ready'  => 1,
  'only_body' => 1,   'only_body' => 1,
  'bgcolor'   =>'#FFFFFF',});   'bgcolor'   =>'#FFFFFF',});
     my $end_page_msg_central =      my $end_page_msg_central = 
  &Apache::loncommon::end_page({'js_ready' => 1});   &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 = 
    &Apache::loncommon::end_page({'js_ready' => 1});
   
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     $docopen=~s/^document\.//;      $docopen=~s/^document\.//;
       my $alertmsg = &mt('Please select a word or group of words from document and then click this link.');
     my %html_js_lt = &Apache::lonlocal::texthash(  
                 comp => 'Compose Message for: ',  
                 incl => 'Include',  
                 type => 'Type',  
                 subj => 'Subject',  
                 mesa => 'Message',  
                 new  => 'New',  
                 save => 'Save',  
                 canc => 'Cancel',  
              );  
     &html_escape(\%html_js_lt);  
     &js_escape(\%html_js_lt);  
     $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));      $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
   
   //===================== Show list of keywords ====================
     function keywords(formname) {
       var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",formname.keywords.value);
       if (nret==null) return;
       formname.keywords.value = nret;
   
       if (formname.keywords.value != "") {
    formname.refresh.value = "on";
    formname.submit();
       }
       return;
     }
   
 //===================== Script to view submitted by ==================  //===================== Script to view submitted by ==================
   function viewSubmitter(submitter) {    function viewSubmitter(submitter) {
     document.SCORE.refresh.value = "on";      document.SCORE.refresh.value = "on";
Line 1644  INNERJS Line 1465  INNERJS
     return;      return;
   }    }
   
   //===================== Script to add keyword(s) ==================
     function getSel() {
       if (document.getSelection) txt = document.getSelection();
       else if (document.selection) txt = document.selection.createRange().text;
       else return;
       var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
       if (cleantxt=="") {
    alert("$alertmsg");
    return;
       }
       var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
       if (nret==null) return;
       document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
       if (document.SCORE.keywords.value != "") {
    document.SCORE.refresh.value = "on";
    document.SCORE.submit();
       }
       return;
     }
   
 //====================== Script for composing message ==============  //====================== Script for composing message ==============
    // preload images     // preload images
    img1 = new Image();     img1 = new Image();
Line 1698  INNERJS Line 1539  INNERJS
   
   function savedMsgHeader(Nmsg,usrctr,fullname) {    function savedMsgHeader(Nmsg,usrctr,fullname) {
     var height = 70*Nmsg+250;      var height = 70*Nmsg+250;
       var scrollbar = "no";
     if (height > 600) {      if (height > 600) {
  height = 600;   height = 600;
    scrollbar = "yes";
     }      }
     var xpos = (screen.width-600)/2;      var xpos = (screen.width-600)/2;
     xpos = (xpos < 0) ? '0' : xpos;      xpos = (xpos < 0) ? '0' : xpos;
     var ypos = (screen.height-height)/2-30;      var ypos = (screen.height-height)/2-30;
     ypos = (ypos < 0) ? '0' : ypos;      ypos = (ypos < 0) ? '0' : ypos;
   
     pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars=yes,screenx='+xpos+',screeny='+ypos+',width=700,height='+height);      pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
     pWin.focus();      pWin.focus();
     pDoc = pWin.document;      pDoc = pWin.document;
     pDoc.$docopen;      pDoc.$docopen;
Line 1714  INNERJS Line 1557  INNERJS
   
     pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");      pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
     pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");      pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
     pDoc.write("<h1>&nbsp;$html_js_lt{'comp'}\"+fullname+\"<\\/h1>");      pDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />");
   
     pDoc.write('<table style="border:1px solid black;"><tr>');      pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
     pDoc.write("<td><b>$html_js_lt{'incl'}<\\/b><\\/td><td><b>$html_js_lt{'type'}<\\/b><\\/td><td><b>$html_js_lt{'mesa'}<\\/td><\\/tr>");      pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
       pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>");
 }  }
     function displaySubject(msg,shwsel) {      function displaySubject(msg,shwsel) {
     pDoc = pWin.document;      pDoc = pWin.document;
     pDoc.write("<tr>");      pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
       pDoc.write("<td>Subject<\\/td>");
     pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");      pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
     pDoc.write("<td>$html_js_lt{'subj'}<\\/td>");      pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>");
     pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"40\\" maxlength=\\"80\\"><\\/td><\\/tr>");  
 }  }
   
   function displaySavedMsg(ctr,msg,shwsel) {    function displaySavedMsg(ctr,msg,shwsel) {
     pDoc = pWin.document;      pDoc = pWin.document;
     pDoc.write("<tr>");      pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
     pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");  
     pDoc.write("<td align=\\"center\\">"+ctr+"<\\/td>");      pDoc.write("<td align=\\"center\\">"+ctr+"<\\/td>");
       pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
     pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"<\\/textarea><\\/td><\\/tr>");      pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"<\\/textarea><\\/td><\\/tr>");
 }  }
   
   function newMsg(newmsg,shwsel) {    function newMsg(newmsg,shwsel) {
     pDoc = pWin.document;      pDoc = pWin.document;
     pDoc.write("<tr>");      pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
       pDoc.write("<td align=\\"center\\">New<\\/td>");
     pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");      pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
     pDoc.write("<td align=\\"center\\">$html_js_lt{'new'}<\\/td>");  
     pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>");      pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>");
 }  }
   
   function msgTail() {    function msgTail() {
     pDoc = pWin.document;      pDoc = pWin.document;
       pDoc.write("<\\/table>");
     pDoc.write("<\\/td><\\/tr><\\/table>&nbsp;");      pDoc.write("<\\/td><\\/tr><\\/table>&nbsp;");
     pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");      pDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
     pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");      pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />");
     pDoc.write("<\\/form>");      pDoc.write("<\\/form>");
     pDoc.write('$end_page_msg_central');      pDoc.write('$end_page_msg_central');
     pDoc.close();      pDoc.close();
 }  }
   
 SUBJAVASCRIPT  
 }  
   
 #--- javascript for essay type problem --  
 sub sub_page_kw_js {  
     my $request = shift;  
   
     unless ($env{'form.compmsg'}) {  
         &commonJSfunctions($request);  
     }  
   
     my $inner_js_highlight_central= (<<INNERJS);  
 <script type="text/javascript">  
     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()  
     }  
 </script>  
 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(<<SUBJAVASCRIPT));  
   
 //===================== Show list of keywords ====================  
   function keywords(formname) {  
     var nret = prompt("$js_lt{'keyw'}",formname.keywords.value);  
     if (nret==null) return;  
     formname.keywords.value = nret;  
   
     if (formname.keywords.value != "") {  
         formname.refresh.value = "on";  
         formname.submit();  
     }  
     return;  
   }  
   
 //===================== Script to add keyword(s) ==================  
   function getSel() {  
     if (document.getSelection) txt = document.getSelection();  
     else if (document.selection) txt = document.selection.createRange().text;  
     else return;  
     if (typeof(txt) != 'string') {  
         txt = String(txt);  
     }  
     var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");  
     if (cleantxt=="") {  
         alert("$js_lt{'plse'}");  
         return;  
     }  
     var nret = prompt("$js_lt{'adds'}",cleantxt);  
     if (nret==null) return;  
     document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;  
     if (document.SCORE.keywords.value != "") {  
         document.SCORE.refresh.value = "on";  
         document.SCORE.submit();  
     }  
     return;  
   }  
   
 //====================== Script for keyword highlight options ==============  //====================== Script for keyword highlight options ==============
   function kwhighlight() {    function kwhighlight() {
     var kwclr    = document.SCORE.kwclr.value;      var kwclr    = document.SCORE.kwclr.value;
Line 1862  INNERJS Line 1606  INNERJS
     var redsel = "";      var redsel = "";
     var grnsel = "";      var grnsel = "";
     var blusel = "";      var blusel = "";
     var txtcol1 = "$js_lt{'col1'}";      if (kwclr=="red")   {var redsel="checked"};
     var txtcol2 = "$js_lt{'col2'}";      if (kwclr=="green") {var grnsel="checked"};
     var txtcol3 = "$js_lt{'col3'}";      if (kwclr=="blue")  {var blusel="checked"};
     var txtsiz1 = "$js_lt{'siz1'}";  
     var txtsiz2 = "$js_lt{'siz2'}";  
     var txtsiz3 = "$js_lt{'siz3'}";  
     var txtsty1 = "$js_lt{'sty1'}";  
     var txtsty2 = "$js_lt{'sty2'}";  
     var txtsty3 = "$js_lt{'sty3'}";  
     if (kwclr=="red")   {var redsel="checked='checked'"};  
     if (kwclr=="green") {var grnsel="checked='checked'"};  
     if (kwclr=="blue")  {var blusel="checked='checked'"};  
     var sznsel = "";      var sznsel = "";
     var sz1sel = "";      var sz1sel = "";
     var sz2sel = "";      var sz2sel = "";
     if (kwsize=="0")  {var sznsel="checked='checked'"};      if (kwsize=="0")  {var sznsel="checked"};
     if (kwsize=="+1") {var sz1sel="checked='checked'"};      if (kwsize=="+1") {var sz1sel="checked"};
     if (kwsize=="+2") {var sz2sel="checked='checked'"};      if (kwsize=="+2") {var sz2sel="checked"};
     var synsel = "";      var synsel = "";
     var syisel = "";      var syisel = "";
     var sybsel = "";      var sybsel = "";
     if (kwstyle=="")    {var synsel="checked='checked'"};      if (kwstyle=="")    {var synsel="checked"};
     if (kwstyle=="<i>") {var syisel="checked='checked'"};      if (kwstyle=="<i>") {var syisel="checked"};
     if (kwstyle=="<b>") {var sybsel="checked='checked'"};      if (kwstyle=="<b>") {var sybsel="checked"};
     highlightCentral();      highlightCentral();
     highlightbody('red',txtcol1,redsel,'0',txtsiz1,sznsel,'',txtsty1,synsel);      highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel);
     highlightbody('green',txtcol2,grnsel,'+1',txtsiz2,sz1sel,'<i>',txtsty2,syisel);      highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel);
     highlightbody('blue',txtcol3,blusel,'+2',txtsiz3,sz2sel,'<b>',txtsty3,sybsel);      highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel);
     highlightend();      highlightend();
     return;      return;
   }    }
Line 1907  INNERJS Line 1642  INNERJS
     hDoc.$docopen;      hDoc.$docopen;
     hDoc.write('$start_page_highlight_central');      hDoc.write('$start_page_highlight_central');
     hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");      hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
     hDoc.write("<h1>$html_js_lt{'kehi'}<\\/h1>");      hDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Keyword Highlight Options<\\/span><\\/h3><br /><br />");
   
     hDoc.write('<table border="0" width="100%"><tr style="background-color:#A1D676">');      hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
     hDoc.write("<th>$html_js_lt{'txtc'}<\\/th><th>$html_js_lt{'font'}<\\/th><th>$html_js_lt{'fnst'}<\\/th><\\/tr>");      hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
       hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>");
   }    }
   
   function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) {     function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { 
     var hDoc = hwdWin.document;      var hDoc = hwdWin.document;
     hDoc.write("<tr>");      hDoc.write("<tr bgcolor=\\"#ffffdd\\">");
     hDoc.write("<td align=\\"left\\">");      hDoc.write("<td align=\\"left\\">");
     hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+" \\/>&nbsp;"+clrtxt+"<\\/td>");      hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+">&nbsp;"+clrtxt+"<\\/td>");
     hDoc.write("<td align=\\"left\\">");      hDoc.write("<td align=\\"left\\">");
     hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+" \\/>&nbsp;"+sztxt+"<\\/td>");      hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+">&nbsp;"+sztxt+"<\\/td>");
     hDoc.write("<td align=\\"left\\">");      hDoc.write("<td align=\\"left\\">");
     hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+" \\/>&nbsp;"+sytxt+"<\\/td>");      hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+">&nbsp;"+sytxt+"<\\/td>");
     hDoc.write("<\\/tr>");      hDoc.write("<\\/tr>");
   }    }
   
   function highlightend() {     function highlightend() { 
     var hDoc = hwdWin.document;      var hDoc = hwdWin.document;
     hDoc.write("<\\/table><br \\/>");      hDoc.write("<\\/table>");
     hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\" \\/>&nbsp;&nbsp;");      hDoc.write("<\\/td><\\/tr><\\/table>&nbsp;");
     hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" onclick=\\"self.close()\\" \\/><br /><br />");      hDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
       hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />");
     hDoc.write("<\\/form>");      hDoc.write("<\\/form>");
     hDoc.write('$end_page_highlight_central');      hDoc.write('$end_page_highlight_central');
     hDoc.close();      hDoc.close();
Line 1977  sub gradeBox { Line 1714  sub gradeBox {
     $wgt       = ($wgt > 0 ? $wgt : '1');      $wgt       = ($wgt > 0 ? $wgt : '1');
     my $score  = ($$record{'resource.'.$partid.'.awarded'} eq '' ?      my $score  = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
   '' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));    '' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
     my $data_WGT='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";      my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
     my $display_part= &get_display_part($partid,$symb);      my $display_part= &get_display_part($partid,$symb);
     my %last_resets = &get_last_resets($symb,$env{'request.course.id'},      my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
        [$partid]);         [$partid]);
Line 1985  sub gradeBox { Line 1722  sub gradeBox {
     if ($last_resets{$partid}) {      if ($last_resets{$partid}) {
         $aggtries = &get_num_tries($record,$last_resets{$partid},$partid);          $aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
     }      }
     my $result=&Apache::loncommon::start_data_table_row();      $result.=&Apache::loncommon::start_data_table_row();
     my $ctr = 0;      my $ctr = 0;
     my $thisweight = 0;      my $thisweight = 0;
     my $increment = &get_increment();      my $increment = &get_increment();
Line 2022  sub gradeBox { Line 1759  sub gradeBox {
   
   
     $result .=       $result .= 
     '<td>'.$data_WGT.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';      '<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
     $result.=&Apache::loncommon::end_data_table_row();      $result.=&Apache::loncommon::end_data_table_row();
     $result.=&Apache::loncommon::start_data_table_row().'<td colspan="6">';  
     $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".      $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
  '<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".   '<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
  '<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.   '<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
Line 2035  sub gradeBox { Line 1771  sub gradeBox {
         $aggtries.'" />'."\n";          $aggtries.'" />'."\n";
     my $res_error;      my $res_error;
     $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error);      $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error);
     $result.='</td>'.&Apache::loncommon::end_data_table_row();  
     if ($res_error) {      if ($res_error) {
         return &navmap_errormsg();          return &navmap_errormsg();
     }      }
Line 2043  sub gradeBox { Line 1778  sub gradeBox {
 }  }
   
 sub handback_box {  sub handback_box {
     my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_;      my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;
     my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,$res_error_pointer);      my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
     return unless ($numessay);  
     my (@respids);      my (@respids);
     my @part_response_id = &flatten_responseType($responseType);       my @part_response_id = &flatten_responseType($responseType);
     foreach my $part_response_id (@part_response_id) {      foreach my $part_response_id (@part_response_id) {
     my ($part,$resp) = @{ $part_response_id };      my ($part,$resp) = @{ $part_response_id };
         if ($part eq $partid) {          if ($part eq $partid) {
Line 2059  sub handback_box { Line 1793  sub handback_box {
  my $prefix = $counter.'_'.$partid.'_'.$respid.'_';   my $prefix = $counter.'_'.$partid.'_'.$respid.'_';
  my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);   my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);
  next if (!@$files);   next if (!@$files);
  my $file_counter = 0;   my $file_counter = 1;
  foreach my $file (@$files) {   foreach my $file (@$files) {
     if ($file =~ /\/portfolio\//) {      if ($file =~ /\/portfolio\//) {
                 $file_counter++;  
            my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|);             my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|);
            my ($name,$version,$ext) = &file_name_version_ext($file_disp);             my ($name,$version,$ext) = &file_name_version_ext($file_disp);
            $file_disp = "$name.$ext";             $file_disp = "$name.$ext";
Line 2070  sub handback_box { Line 1803  sub handback_box {
            $result.=&mt('Return commented version of [_1] to student.',             $result.=&mt('Return commented version of [_1] to student.',
     '<span class="LC_filename">'.$file_disp.'</span>');      '<span class="LC_filename">'.$file_disp.'</span>');
            $result.='<input type="file"   name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";             $result.='<input type="file"   name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
            $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />'."\n";             $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
              $result.='('.&mt('File will be uploaded when you click on Save &amp; Next below.').')<br />';
              $file_counter++;
     }      }
  }   }
         if ($file_counter) {  
             $result .= '<input type="hidden" name="'.$prefix.'countreturndoc" value="'.$file_counter.'" />'."\n".  
                        '<span class="LC_info">'.  
                        '('.&mt('File(s) will be uploaded when you click on Save &amp; Next below.',$file_counter).')</span><br /><br />';  
         }  
     }      }
     return $result;          return $result;    
 }  }
Line 2110  sub show_problem { Line 1840  sub show_problem {
  $companswer=~s|</form>||g;   $companswer=~s|</form>||g;
  $companswer=~s|name="submit"|name="would_have_been_submit"|g;   $companswer=~s|name="submit"|name="would_have_been_submit"|g;
     }      }
     my $renderheading = &mt('View of the problem');  
     my $answerheading = &mt('Correct answer');  
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {  
         my $stu_fullname = $env{'form.fullname'};  
         if ($stu_fullname eq '') {  
             $stu_fullname = &Apache::loncommon::plainname($uname,$udom,'lastname');  
         }  
         my $forwhom = &nameUserString(undef,$stu_fullname,$uname,$udom);  
         if ($forwhom ne '') {  
             $renderheading = &mt('View of the problem for[_1]',$forwhom);  
             $answerheading = &mt('Correct answer for[_1]',$forwhom);  
         }  
     }  
     $rendered=      $rendered=
         '<div class="LC_Box">'          '<div class="LC_Box">'
        .'<h3 class="LC_hcell">'.$renderheading.'</h3>'         .'<h3 class="LC_hcell">'.&mt('View of the problem').'</h3>'
        .$rendered         .$rendered
        .'</div>';         .'</div>';
     $companswer=      $companswer=
         '<div class="LC_Box">'          '<div class="LC_Box">'
        .'<h3 class="LC_hcell">'.$answerheading.'</h3>'         .'<h3 class="LC_hcell">'.&mt('Correct answer').'</h3>'
        .$companswer         .$companswer
        .'</div>';         .'</div>';
     my $result;      my $result;
Line 2147  sub show_problem { Line 1864  sub show_problem {
 sub files_exist {  sub files_exist {
     my ($r, $symb) = @_;      my ($r, $symb) = @_;
     my @students = &Apache::loncommon::get_env_multiple('form.stuinfo');      my @students = &Apache::loncommon::get_env_multiple('form.stuinfo');
   
     foreach my $student (@students) {      foreach my $student (@students) {
         my ($uname,$udom,$fullname) = split(/:/,$student);          my ($uname,$udom,$fullname) = split(/:/,$student);
         my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},          my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
Line 2165  sub files_exist { Line 1883  sub files_exist {
   
 sub download_all_link {  sub download_all_link {
     my ($r,$symb) = @_;      my ($r,$symb) = @_;
     unless (&files_exist($r, $symb)) {  
         $r->print(&mt('There are currently no submitted documents.'));  
         return;  
     }  
     my $all_students =       my $all_students = 
  join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));   join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));
   
Line 2181  sub download_all_link { Line 1895  sub download_all_link {
                              'cgi.'.$identifier.'.parts' => $parts,});                               'cgi.'.$identifier.'.parts' => $parts,});
     $r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.      $r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.
       &mt('Download All Submitted Documents').'</a>');        &mt('Download All Submitted Documents').'</a>');
     return;      return
 }  
   
 sub submit_download_link {  
     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 @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart');  
     if (@chosenparts) {  
         $request->print(&showResourceInfo($symb,$partlist,$responseType,  
                                           undef,undef,1));  
     }  
     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'};  
         (undef,undef,my $fullname) = &getclasslist($getsec,1,$getgroup,$symb,$submitonly,1);  
         if (ref($fullname) eq 'HASH') {  
             my @students = map { $_.':'.$fullname->{$_} } (keys(%{$fullname}));  
             if (@students) {  
                 @{$env{'form.stuinfo'}} = @students;  
                 if ($numdropbox) {  
                     &download_all_link($request,$symb);  
                 } else {  
                     $request->print(&mt('No essayrespose items with dropbox found'));  
                 }  
 # 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'));  
             }  
         } else {  
             $request->print(&mt('Could not retrieve student information'));  
         }  
     } else {  
         $request->print(&mt('No essayresponse items found'));  
     }  
     return;  
 }  }
   
 sub build_section_inputs {  sub build_section_inputs {
Line 2246  sub build_section_inputs { Line 1913  sub build_section_inputs {
   
 # --------------------------- show submissions of a student, option to grade   # --------------------------- show submissions of a student, option to grade 
 sub submission {  sub submission {
     my ($request,$counter,$total,$symb,$divforres,$calledby) = @_;      my ($request,$counter,$total) = @_;
     my ($uname,$udom)     = ($env{'form.student'},$env{'form.userdom'});      my ($uname,$udom)     = ($env{'form.student'},$env{'form.userdom'});
     $udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?      $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'});      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 '';      $env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
       my $symb = &get_symb($request); 
     if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }      if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
     my $probtitle=&Apache::lonnet::gettitle($symb);  
     my ($essayurl,%coursedesc_by_cid);  
   
     if (!&canview($usec)) {      if (!&canview($usec)) {
         $request->print(   $request->print('<span class="LC_warning">Unable to view requested student.('.
             '<span class="LC_warning">'.   $uname.':'.$udom.' in section '.$usec.' in course id '.
             &mt('Unable to view requested student.').   $env{'request.course.id'}.')</span>');
             ' '.&mt('([_1] in section [_2] in course id [_3])',   $request->print(&show_grading_menu_form($symb));
                         $uname.':'.$udom,$usec,$env{'request.course.id'}).  
             '</span>');  
  return;   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'; }      if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; }
     if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }      if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
     if (!$env{'form.vAns'}) { $env{'form.vAns'} = '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 $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
     my $checkIcon = '<img alt="'.&mt('Check Mark').      my $checkIcon = '<img alt="'.&mt('Check Mark').
  '" src="'.$request->dir_config('lonIconsURL').   '" src="'.$request->dir_config('lonIconsURL').
  '/check.gif" height="16" border="0" />';   '/check.gif" height="16" border="0" />';
   
       my %old_essays;
     # header info      # header info
     if ($counter == 0) {      if ($counter == 0) {
         my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart');  
         if (@chosenparts) {  
             $request->print(&showResourceInfo($symb,$partlist,$responseType,'gradesub'));  
         } elsif ($divforres) {  
             $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');  
         } else {  
             $request->print('<br clear="all" />');  
         }  
  &sub_page_js($request);   &sub_page_js($request);
         &sub_grademessage_js($request) if ($env{'form.compmsg'});   &sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');
  &sub_page_kw_js($request) if ($numessay);   $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
       &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
    if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {
       &download_all_link($request, $symb);
    }
    $request->print('<h3>&nbsp;<span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n".
    '<h4>&nbsp;'.&mt('<b>Resource: </b> [_1]',$env{'form.probTitle'}).'</h4>'."\n");
   
  # option to display problem, only once else it cause problems    # option to display problem, only once else it cause problems 
         # with the form later since the problem has a form.          # with the form later since the problem has a form.
Line 2314  sub submission { Line 1965  sub submission {
     $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));      $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
  }   }
   
    # kwclr is the only variable that is guaranteed to be non blank 
           # if this subroutine has been called once.
  my %keyhash = ();   my %keyhash = ();
  if (($env{'form.kwclr'} eq '' && $numessay) || ($env{'form.compmsg'})) {   if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
     %keyhash = &Apache::lonnet::dump('nohist_handgrade',      %keyhash = &Apache::lonnet::dump('nohist_handgrade',
      $env{'course.'.$env{'request.course.id'}.'.domain'},       $env{'course.'.$env{'request.course.id'}.'.domain'},
      $env{'course.'.$env{'request.course.id'}.'.num'});       $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'};      my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
     $env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';      $env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
     $env{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';      $env{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
     $env{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';      $env{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
     $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';      $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
  }      $env{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
  if ($env{'form.compmsg'}) {   $keyhash{$symb.'_subject'} : $env{'form.probTitle'};
     $env{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ?  
  $keyhash{$symb.'_subject'} : $probtitle;  
     $env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';      $env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
  }   }
   
  my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};   my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
  my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));   my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
  $request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n".   $request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n".
  '<input type="hidden" name="command"    value="handgrade" />'."\n".   '<input type="hidden" name="command"    value="handgrade" />'."\n".
    '<input type="hidden" name="saveState"  value="'.$env{'form.saveState'}.'" />'."\n".
  '<input type="hidden" name="Status"     value="'.$stu_status.'" />'."\n".   '<input type="hidden" name="Status"     value="'.$stu_status.'" />'."\n".
  '<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".   '<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
    '<input type="hidden" name="probTitle"  value="'.$env{'form.probTitle'}.'" />'."\n".
  '<input type="hidden" name="refresh"    value="off" />'."\n".   '<input type="hidden" name="refresh"    value="off" />'."\n".
  '<input type="hidden" name="studentNo"  value="" />'."\n".   '<input type="hidden" name="studentNo"  value="" />'."\n".
  '<input type="hidden" name="gradeOpt"   value="" />'."\n".   '<input type="hidden" name="gradeOpt"   value="" />'."\n".
  '<input type="hidden" name="symb"       value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".   '<input type="hidden" name="symb"       value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
    '<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" />'."\n".
  '<input type="hidden" name="vProb"      value="'.$env{'form.vProb'}.'" />'."\n".   '<input type="hidden" name="vProb"      value="'.$env{'form.vProb'}.'" />'."\n".
  '<input type="hidden" name="vAns"       value="'.$env{'form.vAns'}.'" />'."\n".   '<input type="hidden" name="vAns"       value="'.$env{'form.vAns'}.'" />'."\n".
  '<input type="hidden" name="lastSub"    value="'.$env{'form.lastSub'}.'" />'."\n".   '<input type="hidden" name="lastSub"    value="'.$env{'form.lastSub'}.'" />'."\n".
  '<input type="hidden" name="compmsg"    value="'.$env{'form.compmsg'}.'" />'."\n".  
  &build_section_inputs().   &build_section_inputs().
  '<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n".   '<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n".
    '<input type="hidden" name="handgrade"  value="'.$env{'form.handgrade'}.'" />'."\n".
  '<input type="hidden" name="NCT"'.   '<input type="hidden" name="NCT"'.
  ' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");   ' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");
  if ($env{'form.compmsg'}) {   if ($env{'form.handgrade'} eq 'yes') {
     $request->print('<input type="hidden" name="msgsub"   value="'.$env{'form.msgsub'}.'" />'."\n".  
     '<input type="hidden" name="shownSub" value="0" />'."\n".  
     '<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n");  
  }  
  if ($numessay) {  
     $request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n".      $request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n".
     '<input type="hidden" name="kwclr"    value="'.$env{'form.kwclr'}.'" />'."\n".      '<input type="hidden" name="kwclr"    value="'.$env{'form.kwclr'}.'" />'."\n".
     '<input type="hidden" name="kwsize"   value="'.$env{'form.kwsize'}.'" />'."\n".      '<input type="hidden" name="kwsize"   value="'.$env{'form.kwsize'}.'" />'."\n".
     '<input type="hidden" name="kwstyle"  value="'.$env{'form.kwstyle'}.'" />'."\n");      '<input type="hidden" name="kwstyle"  value="'.$env{'form.kwstyle'}.'" />'."\n".
       '<input type="hidden" name="msgsub"   value="'.$env{'form.msgsub'}.'" />'."\n".
       '<input type="hidden" name="shownSub" value="0" />'."\n".
       '<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n");
       foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
    $request->print('<input type="hidden" name="vPart" value="'.$partid.'" />'."\n");
       }
  }   }
   
  my ($cts,$prnmsg) = (1,'');   my ($cts,$prnmsg) = (1,'');
  while ($cts <= $env{'form.savemsgN'}) {   while ($cts <= $env{'form.savemsgN'}) {
     $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.      $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
Line 2377  sub submission { Line 2028  sub submission {
  }   }
  $request->print($prnmsg);   $request->print($prnmsg);
   
  if ($numessay) {   if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {
   
             my %lt = &Apache::lonlocal::texthash(  
                           keyh => 'Keyword Highlighting for Essays',  
                           keyw => 'Keyword Options',  
                           list => 'List',  
                           past => 'Paste Selection to List',  
                           high => 'Highlight Attribute',  
                      );  
 #  #
 # Print out the keyword options line  # Print out the keyword options line
 #  #
     $request->print(      $request->print(<<KEYWORDS);
                 '<div class="LC_columnSection">'  &nbsp;<b>Keyword Options:</b>&nbsp;
                .'<fieldset><legend>'.$lt{'keyh'}.'</legend>'  <a href="javascript:keywords(document.SCORE);" target="_self">List</a>&nbsp; &nbsp;
                .&Apache::lonhtmlcommon::funclist_from_array(  <a href="#" onmousedown="javascript:getSel(); return false"
                     ['<a href="javascript:keywords(document.SCORE);" target="_self">'.$lt{'list'}.'</a>',   CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
                      '<a href="#" onmousedown="javascript:getSel(); return false"  <a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br />
  class="page">'.$lt{'past'}.'</a>',  KEYWORDS
                      '<a href="javascript:kwhighlight();" target="_self">'.$lt{'high'}.'</a>'],  
                     {legend => $lt{'keyw'}})  
                .'</fieldset></div>'  
             );  
   
 #  #
 # Load the other essays for similarity check  # Load the other essays for similarity check
 #  #
             (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);              my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
             if ($essayurl eq 'lib/templates/simpleproblem.problem') {      my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
                 my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};      $apath=&escape($apath);
                 my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};      $apath=~s/\W/\_/gs;
                 if ($cdom ne '' && $cnum ne '') {      %old_essays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
                     my ($map,$id,$res) = &Apache::lonnet::decode_symb($symb);  
                     if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(default(?:|_\d+)\.(?:sequence|page))$}) {  
                         my $apath = $1.'_'.$id;  
                         $apath=~s/\W/\_/gs;  
                         &init_old_essays($symb,$apath,$cdom,$cnum);  
                     }  
                 }  
             } else {  
         my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);  
         $apath=&escape($apath);  
         $apath=~s/\W/\_/gs;  
                 &init_old_essays($symb,$apath,$adom,$aname);  
             }  
         }          }
     }      }
   
Line 2438  sub submission { Line 2063  sub submission {
     if ($perm{'vgr'}) {      if ($perm{'vgr'}) {
         $request->print(          $request->print(
             &Apache::loncommon::track_student_link(              &Apache::loncommon::track_student_link(
                 'View recent activity',                  &mt('View recent activity'),
                 $uname,$udom,'check')                  $uname,$udom,'check')
            .' '             .' '
         );          );
Line 2465  sub submission { Line 2090  sub submission {
     }      }
   
     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);      my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
       my $res_error;
       my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
       if ($res_error) {
           $request->print(&navmap_errormsg());
           return;
       }
   
     # Display student info      # Display student info
     $request->print(($counter == 0 ? '' : '<br />'));      $request->print(($counter == 0 ? '' : '<br />'));
Line 2473  sub submission { Line 2104  sub submission {
               .'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';                .'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';
     $result.='<input type="hidden" name="name'.$counter.      $result.='<input type="hidden" name="name'.$counter.
              '" value="'.$env{'form.fullname'}.'" />'."\n";               '" value="'.$env{'form.fullname'}.'" />'."\n";
     if ($numresp > $numessay) {      if ($env{'form.handgrade'} eq 'no') {
         $result.='<p class="LC_info">'          $result.='<p class="LC_info">'
                 .&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)                  .&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)
                 ."</p>\n";                  ."</p>\n";
     }      }
   
     # If any part of the problem is an essayresponse, then check for collaborators      # If any part of the problem is an essay-response (handgraded), then check for collaborators
     my $fullname;      my $fullname;
     my $col_fullnames = [];      my $col_fullnames = [];
     if ($numessay) {      if ($env{'form.handgrade'} eq 'yes') {
  (my $sub_result,$fullname,$col_fullnames)=   (my $sub_result,$fullname,$col_fullnames)=
     &check_collaborators($symb,$uname,$udom,\%record,$handgrade,      &check_collaborators($symb,$uname,$udom,\%record,$handgrade,
  $counter);   $counter);
Line 2491  sub submission { Line 2122  sub submission {
     $request->print($result."\n");      $request->print($result."\n");
   
     # print student answer/submission      # print student answer/submission
     # Options are (1) Last submission only      # Options are (1) Handgraded submission only
     #             (2) Last submission (with detailed information for that submission)      #             (2) Last submission, includes submission that is not handgraded 
     #             (3) All transactions (by date)      #                  (for multi-response type part)
     #             (4) The whole record (with detailed information for all transactions)      #             (3) Last submission plus the parts info
       #             (4) The whole record for this student
     my ($string,$timestamp)= &get_last_submission(\%record);      if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
    my ($string,$timestamp)= &get_last_submission(\%record);
     my $lastsubonly;  
    my $lastsubonly;
   
     if ($$timestamp eq '') {          if ($$timestamp eq '') {
         $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>';               $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; 
     } else {          } else {
         $lastsubonly =              $lastsubonly =
             '<div class="LC_grade_submissions_body">'                  '<div class="LC_grade_submissions_body">'
            .'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n";                 .'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n";
   
  my %seenparts;      my %seenparts;
  my @part_response_id = &flatten_responseType($responseType);      my @part_response_id = &flatten_responseType($responseType);
  foreach my $part (@part_response_id) {      foreach my $part (@part_response_id) {
     my ($partid,$respid) = @{ $part };   next if ($env{'form.lastSub'} eq 'hdgrade' 
     my $display_part=&get_display_part($partid,$symb);   && $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes');
     if ($env{"form.$uname:$udom:$partid:submitted_by"}) {  
  if (exists($seenparts{$partid})) { next; }   my ($partid,$respid) = @{ $part };
  $seenparts{$partid}=1;   my $display_part=&get_display_part($partid,$symb);
                 $request->print(   if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
                     '<b>'.&mt('Part: [_1]',$display_part).'</b>'.      if (exists($seenparts{$partid})) { next; }
                     ' <b>'.&mt('Collaborative submission by: [_1]',      $seenparts{$partid}=1;
                                '<a href="javascript:viewSubmitter(\''.      my $submitby='<b>Part:</b> '.$display_part.
                                $env{"form.$uname:$udom:$partid:submitted_by"}.   ' <b>Collaborative submission by:</b> '.
                                '\');" target="_self">'.   '<a href="javascript:viewSubmitter(\''.
                                $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a>').   $env{"form.$uname:$udom:$partid:submitted_by"}.
                     '<br />');   '\');" target="_self">'.
  next;   $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
     }      $request->print($submitby);
     my $responsetype = $responseType->{$partid}->{$respid};      next;
     if (!exists($record{"resource.$partid.$respid.submission"})) {   }
                 $lastsubonly.="\n".'<div class="LC_grade_submission_part">'.   my $responsetype = $responseType->{$partid}->{$respid};
                     '<b>'.&mt('Part: [_1]',$display_part).'</b>'.   if (!exists($record{"resource.$partid.$respid.submission"})) {
                     ' <span class="LC_internal_info">'.                      $lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
                     '('.&mt('Response ID: [_1]',$respid).')'.                          '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
                     '</span>&nbsp; &nbsp;'.                          ' <span class="LC_internal_info">'.
             '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';                          '('.&mt('Part ID: [_1]',$respid).')'.
  next;                          '</span>&nbsp; &nbsp;'.
     }   '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
     foreach my $submission (@$string) {      next;
  my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);   }
  if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }   foreach my $submission (@$string) {
  my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4);      my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
  # Similarity check      if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
                 my $similar='';      my ($ressub,$hide,$subval) = split(/:/,$submission,3);
                 my ($type,$trial,$rndseed);      # Similarity check
                 if ($hide eq 'rand') {      my $similar='';
                     $type = 'randomizetry';      if($env{'form.checkPlag'}){
                     $trial = $record{"resource.$partid.tries"};   my ($oname,$odom,$ocrsid,$oessay,$osim)=
                     $rndseed = $record{"resource.$partid.rndseed"};      &most_similar($uname,$udom,$subval,\%old_essays);
                 }   if ($osim) {
  if ($env{'form.checkPlag'}) {      $osim=int($osim*100.0);
     my ($oname,$odom,$ocrsid,$oessay,$osim)=      my %old_course_desc = 
         &most_similar($uname,$udom,$symb,$subval);   &Apache::lonnet::coursedescription($ocrsid,
     if ($osim) {     {'one_time' => 1});
         $osim=int($osim*100.0);  
                         if ($hide eq 'anon') {                              if ($hide) {
                             $similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.                                  $similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.
                                      &mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';                                           &mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';
                         } else {                              } else {
     $similar='<hr />';          $similar="<hr /><h3><span class=\"LC_warning\">".
                             if ($essayurl eq 'lib/templates/simpleproblem.problem') {  
                                 $similar .= '<h3><span class="LC_warning">'.  
                                             &mt('Essay is [_1]% similar to an essay by [_2]',  
                                                 $osim,  
                                                 &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')').  
                                             '</span></h3>';  
                             } elsif ($ocrsid ne '') {  
                                 my %old_course_desc;  
                                 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 .=  
                                     '<h3><span class="LC_warning">'.  
     &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',      &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
         $osim,          $osim,
         &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',          &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
         $old_course_desc{'description'},          $old_course_desc{'description'},
         $old_course_desc{'num'},          $old_course_desc{'num'},
         $old_course_desc{'domain'}).          $old_course_desc{'domain'}).
     '</span></h3>';      '</span></h3><blockquote><i>'.
                             } else {      &keywords_highlight($oessay).
                                 $similar .=      '</i></blockquote><hr />';
                                     '<h3><span class="LC_warning">'.  
                                     &mt('Essay is [_1]% similar to an essay by [_2] in an unknown course',  
                                         $osim,  
                                         &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')').  
                                     '</span></h3>';  
                             }                              }
                             $similar .= '<blockquote><i>'.   }
                                         &keywords_highlight($oessay).      }
                                         '</i></blockquote><hr />';      my $order=&get_order($partid,$respid,$symb,$uname,$udom);
         }      if ($env{'form.lastSub'} eq 'lastonly' || 
                     }   ($env{'form.lastSub'} eq 'hdgrade' && 
                 }   $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
  my $order=&get_order($partid,$respid,$symb,$uname,$udom,   my $display_part=&get_display_part($partid,$symb);
                                      undef,$type,$trial,$rndseed);                          $lastsubonly.='<div class="LC_grade_submission_part">'.
                 if (($env{'form.lastSub'} eq 'lastonly') ||                              '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
                     ($env{'form.lastSub'} eq 'datesub')  ||                              ' <span class="LC_internal_info">'.
                     ($env{'form.lastSub'} =~ /^(last|all)$/)) {                              '('.&mt('Part ID: [_1]',$respid).')'.
     my $display_part=&get_display_part($partid,$symb);                              '</span>&nbsp; &nbsp;';
                     $lastsubonly.='<div class="LC_grade_submission_part">'.   my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
                         '<b>'.&mt('Part: [_1]',$display_part).'</b>'.   if (@$files) {
                         ' <span class="LC_internal_info">'.                              if ($hide) {
                         '('.&mt('Response ID: [_1]',$respid).')'.                                  $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
                         '</span>&nbsp; &nbsp;';  
     my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);  
     if (@$files) {  
                         if ($hide eq 'anon') {  
                             $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));  
                         } else {  
                             $lastsubonly.='<br /><br />'.'<b>'.&mt('Submitted Files:').'</b>'  
                                          .'<br /><span class="LC_warning">';  
                             if(@$files == 1) {  
                                 $lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!');  
                             } else {                              } else {
                                 $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!');                                  $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
                             }                                  foreach my $file (@$files) {
                             $lastsubonly .= '</span>';                                      &Apache::lonnet::allowuploaded('/adm/grades',$file);
                             foreach my $file (@$files) {                                      $lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" /> '.$file.'</a>';
                                 &Apache::lonnet::allowuploaded('/adm/grades',$file);                                  }
                                 $lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" alt="" /> '.$file.'</a>';  
                             }                              }
       $lastsubonly.='<br />';
    }
                           if ($hide) {
                               $lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>'; 
                           } else {
       $lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
           &cleanRecord($subval,$responsetype,$symb,$partid,
        $respid,\%record,$order,undef,$uname,$udom);
                         }                          }
  $lastsubonly.='<br />';   if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
    $lastsubonly.='</div>';
     }      }
                     if ($hide eq 'anon') {  
                         $lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>';   
                     } else {  
                         $lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>';  
                         if ($draft) {  
                             $lastsubonly.= ' <span class="LC_warning">'.&mt('Draft Copy').'</span>';  
                         }  
                         $subval =  
     &cleanRecord($subval,$responsetype,$symb,$partid,  
  $respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);  
                         if ($responsetype eq 'essay') {  
                             $subval =~ s{\n}{<br />}g;  
                         }  
                         $lastsubonly.=$subval."\n";  
                     }  
                     if ($similar) {$lastsubonly.="<br /><br />$similar\n";}  
     $lastsubonly.='</div>';  
  }   }
     }      }
       $lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
  }   }
  $lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body   $request->print($lastsubonly);
     }     } elsif ($env{'form.lastSub'} eq 'datesub') {
     $request->print($lastsubonly);  # my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
     if ($env{'form.lastSub'} eq 'datesub') {      my ($parts,$handgrade,$responseType) = &response_type($symb);
         my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error);  
  $request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));   $request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
     }      } elsif ($env{'form.lastSub'} =~ /^(last|all)$/) {
     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'},   $env{'request.course.id'},
  $last,'.submission',   $last,'.submission',
  'Apache::grades::keywords_highlight',   'Apache::grades::keywords_highlight'));
                                                                  $usec,$identifier));  
     }      }
   
     $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'      $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
  .$udom.'" />'."\n");   .$udom.'" />'."\n");
     # return if view submission with no grading option      # return if view submission with no grading option
     if (!&canmodify($usec)) {      if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) {
         $request->print('<p><span class="LC_warning">'.&mt('No grading privileges').'</span></p></div>');   my $toGrade.='<input type="button" value="Grade Student" '.
         return;      'onclick="javascript:checksubmit(this.form,\'Grade Student\',\''
       .$counter.'\');" target="_self" /> &nbsp;'."\n" if (&canmodify($usec));
    $toGrade.='</div>'."\n";
    if (($env{'form.command'} eq 'submission') || 
       ($env{'form.command'} eq 'processGroup' && $counter == $total)) {
       $toGrade.='</form>'.&show_grading_menu_form($symb); 
    }
    $request->print($toGrade);
    return;
     } else {      } else {
  $request->print('</div>'."\n");   $request->print('</div>'."\n");
     }      }
   
     # grading message center      # essay grading message center
       if ($env{'form.handgrade'} eq 'yes') {
     if ($env{'form.compmsg'}) {   my $result='<div class="LC_grade_message_center">';
         my $result='<div class="LC_Box">'.      
                    '<h3 class="LC_hcell">'.&mt('Send Message').'</h3>'.   $result.='<div class="LC_grade_message_center_header">'.
                    '<div class="LC_grade_message_center_body">';      &mt('Send Message').'</div><div class="LC_grade_message_center_body">';
         my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});   my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
         my $msgfor = $givenn.' '.$lastname;   my $msgfor = $givenn.' '.$lastname;
         if (scalar(@$col_fullnames) > 0) {   if (scalar(@$col_fullnames) > 0) {
             my $lastone = pop(@$col_fullnames);      my $lastone = pop(@$col_fullnames);
             $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';      $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';
         }   }
         $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript   $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
         $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".   $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
                  '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".      '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
          '&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.   $result.='&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
                  ',\''.$msgfor.'\');" target="_self">'.      ',\''.$msgfor.'\');" target="_self">'.
                  &mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).'</a><label> ('.      &mt('Compose message to student').(scalar(@$col_fullnames) >= 1 ? 's' : '').'</a><label> ('.
                  &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.      &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
                  ' <img src="'.$request->dir_config('lonIconsURL').      '<img src="'.$request->dir_config('lonIconsURL').
                  '/mailbkgrd.gif" width="14" height="10" alt="" name="mailicon'.$counter.'" />'."\n".      '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
                  '<br />&nbsp;('.      '<br />&nbsp;('.
                  &mt('Message will be sent when you click on Save &amp; Next below.').")\n".      &mt('Message will be sent when you click on Save &amp; Next below.').")\n";
          '</div></div>';   $result.='</div></div>';
         $request->print($result);   $request->print($result);
     }      }
   
     my %seen = ();      my %seen = ();
Line 2716  sub submission { Line 2310  sub submission {
  my $part_resp = join('_',@{ $part_response_id });   my $part_resp = join('_',@{ $part_response_id });
  next if ($seen{$partid} > 0);   next if ($seen{$partid} > 0);
  $seen{$partid}++;   $seen{$partid}++;
    next if ($$handgrade{$part_resp} ne 'yes' 
    && $env{'form.lastSub'} eq 'hdgrade');
  push(@partlist,$partid);   push(@partlist,$partid);
  push(@gradePartRespid,$partid.'.'.$respid);   push(@gradePartRespid,$partid.'.'.$respid);
  $request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));   $request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
Line 2766  sub submission { Line 2362  sub submission {
         $endform.="<input type='hidden' value='".&get_increment().          $endform.="<input type='hidden' value='".&get_increment().
             "' name='increment' />";              "' name='increment' />";
  $endform.='</td></tr></table></form>';   $endform.='</td></tr></table></form>';
    $endform.=&show_grading_menu_form($symb);
  $request->print($endform);   $request->print($endform);
     }      }
     return '';      return '';
Line 2784  sub check_collaborators { Line 2381  sub check_collaborators {
  next if ($record->{'resource.'.$part.'.collaborators'} eq '');   next if ($record->{'resource.'.$part.'.collaborators'} eq '');
  my (@good_collaborators, @bad_collaborators);   my (@good_collaborators, @bad_collaborators);
  foreach my $possible_collaborator   foreach my $possible_collaborator
     (split(/[,;\s]+/,$record->{'resource.'.$part.'.collaborators'})) {       (split(/,?\s+/,$record->{'resource.'.$part.'.collaborators'})) { 
     $possible_collaborator =~ s/[\$\^\(\)]//g;      $possible_collaborator =~ s/[\$\^\(\)]//g;
     next if ($possible_collaborator eq '');      next if ($possible_collaborator eq '');
     my ($co_name,$co_dom) = split(/:/,$possible_collaborator);      my ($co_name,$co_dom) = split(/\@|:/,$possible_collaborator);
     $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);      $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);
     next if ($co_name eq $uname && $co_dom eq $udom);      next if ($co_name eq $uname && $co_dom eq $udom);
     # Doing this grep allows 'fuzzy' specification      # Doing this grep allows 'fuzzy' specification
Line 2800  sub check_collaborators { Line 2397  sub check_collaborators {
     }      }
  }   }
  if (scalar(@good_collaborators) != 0) {   if (scalar(@good_collaborators) != 0) {
     $result.='<br />'.&mt('Collaborators:').'<ol>';      $result.='<br />'.&mt('Collaborators: ');
     foreach my $name (@good_collaborators) {      foreach my $name (@good_collaborators) {
  my ($lastname,$givenn) = split(/,/,$$fullname{$name});   my ($lastname,$givenn) = split(/,/,$$fullname{$name});
  push(@col_fullnames, $givenn.' '.$lastname);   push(@col_fullnames, $givenn.' '.$lastname);
  $result.='<li>'.$fullname->{$name}.'</li>';   $result.=$fullname->{$name}.'&nbsp; &nbsp; &nbsp;';
     }      }
     $result.='</ol><br />'."\n";      $result.='<br />'."\n";
     my ($part)=split(/\./,$part);      my ($part)=split(/\./,$part);
     $result.='<input type="hidden" name="collaborator'.$counter.      $result.='<input type="hidden" name="collaborator'.$counter.
  '" value="'.$part.':'.(join ':',@good_collaborators).'" />'.   '" value="'.$part.':'.(join ':',@good_collaborators).'" />'.
Line 2842  sub get_last_submission { Line 2439  sub get_last_submission {
     &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});      &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
     }      }
  }   }
         my (%typeparts,%randombytry);          my %typeparts;
         my $showsurv =           my $showsurv = 
             &Apache::lonnet::allowed('vas',$env{'request.course.id'});              &Apache::lonnet::allowed('vas',$env{'request.course.id'});
         foreach my $key (sort(keys(%lasthash))) {          foreach my $key (sort(keys(%lasthash))) {
             if ($key =~ /\.type$/) {              if ($key =~ /\.type$/) {
                 if (($lasthash{$key} eq 'anonsurvey') ||                   if (($lasthash{$key} eq 'anonsurvey') || 
                     ($lasthash{$key} eq 'anonsurveycred') ||                      ($lasthash{$key} eq 'anonsurveycred')) {
                     ($lasthash{$key} eq 'randomizetry')) {  
                     my ($ign,@parts) = split(/\./,$key);                      my ($ign,@parts) = split(/\./,$key);
                     pop(@parts);                      pop(@parts);
                     my $id = join('.',@parts);                      unless ($showsurv) {
                     if ($lasthash{$key} eq 'randomizetry') {                          my $id = join(',',@parts);
                         $randombytry{$ign.'.'.$id} = $lasthash{$key};                          $typeparts{$ign.'.'.$id} = $lasthash{$key};
                     } else {  
                         unless ($showsurv) {  
                             $typeparts{$ign.'.'.$id} = $lasthash{$key};  
                         }  
                     }                      }
                     delete($lasthash{$key});                      delete($lasthash{$key});
                 }                  }
             }              }
         }          }
         my @hidden = keys(%typeparts);          my @hidden = keys(%typeparts);
         my @randomize = keys(%randombytry);  
  foreach my $key (keys(%lasthash)) {   foreach my $key (keys(%lasthash)) {
     next if ($key !~ /\.submission$/);      next if ($key !~ /\.submission$/);
             my $hide;              my $hide;
             if (@hidden) {              if (@hidden) {
                 foreach my $id (@hidden) {                  foreach my $id (@hidden) {
                     if ($key =~ /^\Q$id\E/) {                      if ($key =~ /^\Q$id\E/) {
                         $hide = 'anon';                          $hide = 1;
                         last;                          last;
                     }                      }
                 }                  }
             }              }
             unless ($hide) {  
                 if (@randomize) {  
                     foreach my $id (@randomize) {  
                         if ($key =~ /^\Q$id\E/) {  
                             $hide = 'rand';  
                             last;  
                         }  
                     }  
                 }  
             }  
     my ($partid,$foo) = split(/submission$/,$key);      my ($partid,$foo) = split(/submission$/,$key);
     my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? 1 : 0;      my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
             push(@string, join(':', $key, $hide, $draft, (   '<span class="LC_warning">Draft Copy</span> ' : '';
                 ref($lasthash{$key}) eq 'ARRAY' ?      push(@string, join(':', $key, $hide, $draft.$lasthash{$key}));
                     join(',', @{$lasthash{$key}}) : $lasthash{$key}) ));  
  }   }
     }      }
     if (!@string) {      if (!@string) {
Line 2914  sub keywords_highlight { Line 2494  sub keywords_highlight {
     return $string;      return $string;
 }  }
   
 # For Tasks provide a mechanism to display previous version for one specific student  
   
 sub show_previous_task_version {  
     my ($request,$symb) = @_;  
     if ($symb eq '') {  
         $request->print(  
             '<span class="LC_error">'.  
             &mt('Unable to handle ambiguous references.').  
             '</span>');  
         return '';  
     }  
     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('<span class="LC_warning">'.  
                         &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'}).  
                         '</span>');  
         return;  
     }  
     my $mode = 'both';  
     my $isTask = ($symb =~/\.task$/);  
     if ($isTask) {  
         if ($env{'form.previousversion'} =~ /^\d+$/) {  
             if ($env{'form.fullname'} eq '') {  
                 $env{'form.fullname'} =  
                     &Apache::loncommon::plainname($uname,$udom,'lastname');  
             }  
             my $probtitle=&Apache::lonnet::gettitle($symb);  
             $request->print("\n\n".  
                             '<div class="LC_grade_show_user">'.  
                             '<h2>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).  
                             '</h2>'."\n");  
             &Apache::lonxml::clear_problem_counter();  
             $request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode,  
                             {'previousversion' => $env{'form.previousversion'} }));  
             $request->print("\n</div>");  
         }  
     }  
     return;  
 }  
   
 sub choose_task_version_form {  
     my ($symb,$uname,$udom,$nomenu) = @_;  
     my $isTask = ($symb =~/\.task$/);  
     my ($current,$version,$result,$js,$displayed,$rowtitle);  
     if ($isTask) {  
         my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},  
                                               $udom,$uname);  
         if (($record{'resource.0.version'} eq '') ||  
             ($record{'resource.0.version'} < 2)) {  
             return ($record{'resource.0.version'},  
                     $record{'resource.0.version'},$result,$js);  
         } else {  
             $current = $record{'resource.0.version'};  
         }  
         if ($env{'form.previousversion'}) {  
             $displayed = $env{'form.previousversion'};  
             $rowtitle = &mt('Choose another version:')  
         } else {  
             $displayed = $current;  
             $rowtitle = &mt('Show earlier version:');  
         }  
         $result = '<div class="LC_left_float">';  
         my $list;  
         my $numversions = 0;  
         for (my $i=1; $i<=$record{'resource.0.version'}; $i++) {  
             if ($i == $current) {  
                 if (!$env{'form.previousversion'} || $nomenu) {  
                     next;  
                 } else {  
                     $list .= '<option value="'.$i.'">'.&mt('Current').'</option>'."\n";  
                     $numversions ++;  
                 }  
             } elsif (defined($record{'resource.'.$i.'.0.status'})) {  
                 unless ($i == $env{'form.previousversion'}) {  
                     $numversions ++;  
                 }  
                 $list .= '<option value="'.$i.'">'.$i.'</option>'."\n";  
             }  
         }  
         if ($numversions) {  
             $symb = &HTML::Entities::encode($symb,'<>"&');  
             $result .=  
                 '<form name="getprev" method="post" action=""'.  
                 ' onsubmit="return previousVersion('."'$uname','$udom','$symb','$displayed'".');">'.  
                 &Apache::loncommon::start_data_table().  
                 &Apache::loncommon::start_data_table_row().  
                 '<th align="left">'.$rowtitle.'</th>'.  
                 '<td><select name="version">'.  
                 '<option>'.&mt('Select').'</option>'.  
                 $list.  
                 '</select></td>'.  
                 &Apache::loncommon::end_data_table_row();  
             unless ($nomenu) {  
                 $result .= &Apache::loncommon::start_data_table_row().  
                 '<th align="left">'.&mt('Open in new window').'</th>'.  
                 '<td><span class="LC_nobreak">'.  
                 '<label><input type="radio" name="prevwin" value="1" />'.  
                 &mt('Yes').'</label>'.  
                 '<label><input type="radio" name="prevwin" value="0" checked="checked" />'.&mt('No').'</label>'.  
                 '</span></td>'.  
                 &Apache::loncommon::end_data_table_row();  
             }  
             $result .=  
                 &Apache::loncommon::start_data_table_row().  
                 '<th align="left">&nbsp;</th>'.  
                 '<td>'.  
                 '<input type="submit" name="prevsub" value="'.&mt('Display').'" />'.  
                 '</td>'.  
                 &Apache::loncommon::end_data_table_row().  
                 &Apache::loncommon::end_data_table().  
                 '</form>';  
             $js = &previous_display_javascript($nomenu,$current);  
         } elsif ($displayed && $nomenu) {  
             $result .= '<a href="javascript:window.close()">'.&mt('Close window').'</a>';  
         } else {  
             $result .= &mt('No previous versions to show for this student');  
         }  
         $result .= '</div>';  
     }  
     return ($current,$displayed,$result,$js);  
 }  
   
 sub previous_display_javascript {  
     my ($nomenu,$current) = @_;  
     my $js = <<"JSONE";  
 <script type="text/javascript">  
 // <![CDATA[  
 function previousVersion(uname,udom,symb) {  
     var current = '$current';  
     var version = document.getprev.version.options[document.getprev.version.selectedIndex].value;  
     var prevstr = new RegExp("^\\\\d+\$");  
     if (!prevstr.test(version)) {  
         return false;  
     }  
     var url = '';  
     if (version == current) {  
         url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=submission';  
     } else {  
         url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=versionsub&previousversion='+version;  
     }  
 JSONE  
     if ($nomenu) {  
         $js .= <<"JSTWO";  
     document.location.href = url;  
 JSTWO  
     } else {  
         $js .= <<"JSTHREE";  
     var newwin = 0;  
     for (var i=0; i<document.getprev.prevwin.length; i++) {  
         if (document.getprev.prevwin[i].checked == true) {  
             newwin = document.getprev.prevwin[i].value;  
         }  
     }  
     if (newwin == 1) {  
         var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no';  
         url = url+'&inhibitmenu=yes';  
         if (typeof(previousWin) == 'undefined' || previousWin.closed) {  
             previousWin = window.open(url,'',options,1);  
         } else {  
             previousWin.location.href = url;  
         }  
         previousWin.focus();  
         return false;  
     } else {  
         document.location.href = url;  
         return false;  
     }  
 JSTHREE  
     }  
     $js .= <<"ENDJS";  
     return false;  
 }  
 // ]]>  
 </script>  
 ENDJS  
   
 }  
   
 #--- Called from submission routine  #--- Called from submission routine
 sub processHandGrade {  sub processHandGrade {
     my ($request,$symb) = @_;      my ($request) = shift;
       my $symb   = &get_symb($request);
     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);      my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
     my $button = $env{'form.gradeOpt'};      my $button = $env{'form.gradeOpt'};
     my $ngrade = $env{'form.NCT'};      my $ngrade = $env{'form.NCT'};
Line 3109  sub processHandGrade { Line 2509  sub processHandGrade {
  my $ctr = 0;   my $ctr = 0;
  while ($ctr < $ngrade) {   while ($ctr < $ngrade) {
     my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});      my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
     my ($errorflag,$pts,$wgt,$numhidden) =       my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$uname,$udom,$ctr);
                 &saveHandGrade($request,$symb,$uname,$udom,$ctr);  
     if ($errorflag eq 'no_score') {      if ($errorflag eq 'no_score') {
  $ctr++;   $ctr++;
  next;   next;
     }      }
     if ($errorflag eq 'not_allowed') {      if ($errorflag eq 'not_allowed') {
                 $request->print(   $request->print("<span class=\"LC_warning\">Not allowed to modify grades for $uname:$udom</span>");
                     '<span class="LC_error">'  
                    .&mt('Not allowed to modify grades for [_1]',"$uname:$udom")  
                    .'</span>');  
  $ctr++;   $ctr++;
  next;   next;
     }      }
             if ($numhidden) {  
                 $request->print(  
                     '<span class="LC_info">'  
                    .&mt('For [_1]: [quant,_2,transaction] hidden',"$uname:$udom",$numhidden)  
                    .'</span><br />');  
             }  
     my $includemsg = $env{'form.includemsg'.$ctr};      my $includemsg = $env{'form.includemsg'.$ctr};
     my ($subject,$message,$msgstatus) = ('','','');      my ($subject,$message,$msgstatus) = ('','','');
     my $restitle = &Apache::lonnet::gettitle($symb);      my $restitle = &Apache::lonnet::gettitle($symb);
Line 3147  sub processHandGrade { Line 2537  sub processHandGrade {
  if ($env{'form.withgrades'.$ctr}) {   if ($env{'form.withgrades'.$ctr}) {
     $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;      $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
     $messagetail = " for <a href=\"".      $messagetail = " for <a href=\"".
                    $feedurl."?symb=$showsymb\">$restitle</a>";                     $feedurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
  }   }
  $msgstatus =    $msgstatus = 
                     &Apache::lonmsg::user_normal_msg($uname,$udom,$subject,                      &Apache::lonmsg::user_normal_msg($uname,$udom,$subject,
Line 3156  sub processHandGrade { Line 2546  sub processHandGrade {
                                                      undef,undef,$showsymb,                                                       undef,undef,$showsymb,
                                                      $restitle);                                                       $restitle);
  $request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '.   $request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '.
  $msgstatus.'<br />');   $msgstatus);
     }      }
     if ($env{'form.collaborator'.$ctr}) {      if ($env{'form.collaborator'.$ctr}) {
  my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");   my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
Line 3175  sub processHandGrade { Line 2565  sub processHandGrade {
       $udom);        $udom);
     if ($env{'form.withgrades'.$ctr}) {      if ($env{'form.withgrades'.$ctr}) {
  $messagetail = " for <a href=\"".   $messagetail = " for <a href=\"".
                                     $baseurl."?symb=$showsymb\">$restitle</a>";                                      $baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
     }      }
     $msgstatus =       $msgstatus = 
  &Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);   &Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);
Line 3187  sub processHandGrade { Line 2577  sub processHandGrade {
  }   }
     }      }
   
     my $res_error;      if ($env{'form.handgrade'} eq 'yes') {
     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   # Keywords sorted in alphabatical order
  my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};   my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
    my %keyhash = ();
  $env{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;   $env{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
  $env{'form.keywords'}           =~ s/^\s+|\s+$//g;   $env{'form.keywords'}           =~ s/^\s+|\s+$//;
  my (@keywords) = sort(split(/\s+/,$env{'form.keywords'}));   my (@keywords) = sort(split(/\s+/,$env{'form.keywords'}));
  $env{'form.keywords'} = join(' ',@keywords);   $env{'form.keywords'} = join(' ',@keywords);
  $keyhash{$symb.'_keywords'}     = $env{'form.keywords'};   $keyhash{$symb.'_keywords'}     = $env{'form.keywords'};
Line 3207  sub processHandGrade { Line 2590  sub processHandGrade {
  $keyhash{$loginuser.'_kwclr'}   = $env{'form.kwclr'};   $keyhash{$loginuser.'_kwclr'}   = $env{'form.kwclr'};
  $keyhash{$loginuser.'_kwsize'}  = $env{'form.kwsize'};   $keyhash{$loginuser.'_kwsize'}  = $env{'form.kwsize'};
  $keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'};   $keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'};
     }  
   
     if ($env{'form.compmsg'}) {  
  # message center - Order of message gets changed. Blank line is eliminated.   # message center - Order of message gets changed. Blank line is eliminated.
  # New messages are saved in env for the next student.   # New messages are saved in env for the next student.
  # All messages are saved in nohist_handgrade.db   # All messages are saved in nohist_handgrade.db
Line 3232  sub processHandGrade { Line 2613  sub processHandGrade {
  }   }
  $env{'form.savemsgN'} = --$idx;   $env{'form.savemsgN'} = --$idx;
  $keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'};   $keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'};
     }  
     if (($numessay) || ($env{'form.compmsg'})) {  
  my $putresult = &Apache::lonnet::put   my $putresult = &Apache::lonnet::put
     ('nohist_handgrade',\%keyhash,$cdom,$cnum);      ('nohist_handgrade',\%keyhash,$cdom,$cnum);
     }      }
   
     # Called by Save & Refresh from Highlight Attribute Window      # Called by Save & Refresh from Highlight Attribute Window
     my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');      my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
     if ($env{'form.refresh'} eq 'on') {      if ($env{'form.refresh'} eq 'on') {
Line 3252  sub processHandGrade { Line 2630  sub processHandGrade {
     my $processUser = $env{'form.unamedom'.$ctr};      my $processUser = $env{'form.unamedom'.$ctr};
     ($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);      ($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
     $env{'form.fullname'} = $$fullname{$processUser};      $env{'form.fullname'} = $$fullname{$processUser};
     &submission($request,$ctr,$total-1,$symb);      &submission($request,$ctr,$total-1);
     $ctr++;      $ctr++;
  }   }
  return '';   return '';
     }      }
   
   # Go directly to grade student - from submission or link from chart page
       if ($button eq 'Grade Student') {
   # (undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);
    my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
    ($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
    $env{'form.fullname'} = $$fullname{$processUser};
    &submission($request,0,0);
    return '';
       }
   
     # Get the next/previous one or group of students      # Get the next/previous one or group of students
     my $firststu = $env{'form.unamedom0'};      my $firststu = $env{'form.unamedom0'};
     my $laststu = $env{'form.unamedom'.($ngrade-1)};      my $laststu = $env{'form.unamedom'.($ngrade-1)};
Line 3288  sub processHandGrade { Line 2676  sub processHandGrade {
     }      }
     $ctr = 0;      $ctr = 0;
     @parsedlist = reverse @parsedlist if ($button eq 'Previous');      @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) {      foreach my $student (@parsedlist) {
  my $submitonly=$env{'form.submitonly'};   my $submitonly=$env{'form.submitonly'};
  my ($uname,$udom) = split(/:/,$student);   my ($uname,$udom) = split(/:/,$student);
Line 3333  sub processHandGrade { Line 2727  sub processHandGrade {
  $env{'form.student'}  = $uname;   $env{'form.student'}  = $uname;
  $env{'form.userdom'}  = $udom;   $env{'form.userdom'}  = $udom;
  $env{'form.fullname'} = $$fullname{$_};   $env{'form.fullname'} = $$fullname{$_};
  &submission($request,$ctr,$total,$symb);   &submission($request,$ctr,$total);
  $ctr++;   $ctr++;
     }      }
     if ($total < 0) {      if ($total < 0) {
         my $the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n";   my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";
    $the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n";
    $the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";
    $the_end.=&show_grading_menu_form($symb);
  $request->print($the_end);   $request->print($the_end);
     }      }
     return '';      return '';
Line 3353  sub saveHandGrade { Line 2750  sub saveHandGrade {
     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);      my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
     my @parts_graded;      my @parts_graded;
     my %newrecord  = ();      my %newrecord  = ();
     my ($pts,$wgt,$totchg) = ('','',0);      my ($pts,$wgt) = ('','');
     my %aggregate = ();      my %aggregate = ();
     my $aggregateflag = 0;      my $aggregateflag = 0;
     if ($env{'form.HIDE'.$newflg}) {  
         my ($version,$parts) = split(/:/,$env{'form.HIDE'.$newflg},2);  
         my $numchgs = &makehidden($version,$parts,\%record,$symb,$domain,$stuname,1);  
         $totchg += $numchgs;  
     }  
     my @parts = split(/:/,$env{'form.partlist'.$newflg});      my @parts = split(/:/,$env{'form.partlist'.$newflg});
     foreach my $new_part (@parts) {      foreach my $new_part (@parts) {
  #collaborator ($submi may vary for different parts   #collaborator ($submi may vary for different parts
Line 3463  sub saveHandGrade { Line 2855  sub saveHandGrade {
         &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,          &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
       $cdom,$cnum);        $cdom,$cnum);
     }      }
     return ('',$pts,$wgt,$totchg);      return ('',$pts,$wgt);
 }  
   
 sub makehidden {  
     my ($version,$parts,$record,$symb,$domain,$stuname,$tolog) = @_;  
     return unless (ref($record) eq 'HASH');  
     my %modified;  
     my $numchanged = 0;  
     if (exists($record->{$version.':keys'})) {  
         my $partsregexp = $parts;  
         $partsregexp =~ s/,/|/g;  
         foreach my $key (split(/\:/,$record->{$version.':keys'})) {  
             if ($key =~ /^resource\.(?:$partsregexp)\.([^\.]+)$/) {  
                  my $item = $1;  
                  unless (($item eq 'solved') || ($item =~ /^award(|msg|ed)$/)) {  
                      $modified{$key} = $record->{$version.':'.$key};  
                  }  
             } elsif ($key =~ m{^(resource\.(?:$partsregexp)\.[^\.]+\.)(.+)$}) {  
                 $modified{$1.'hidden'.$2} = $record->{$version.':'.$key};  
             } elsif ($key =~ /^(ip|timestamp|host)$/) {  
                 $modified{$key} = $record->{$version.':'.$key};  
             }  
         }  
         if (keys(%modified)) {  
             if (&Apache::lonnet::putstore($env{'request.course.id'},$symb,$version,\%modified,  
                                           $domain,$stuname,$tolog) eq 'ok') {  
                 $numchanged ++;  
             }  
         }  
     }  
     return $numchanged;  
 }  }
   
 sub check_and_remove_from_queue {  sub check_and_remove_from_queue {
Line 3523  sub handback_files { Line 2885  sub handback_files {
         $request->print('<br />'.&navmap_errormsg().'<br />');          $request->print('<br />'.&navmap_errormsg().'<br />');
         return;          return;
     }      }
     my @handedback;  
     my $file_msg;  
     my @part_response_id = &flatten_responseType($responseType);      my @part_response_id = &flatten_responseType($responseType);
     foreach my $part_response_id (@part_response_id) {      foreach my $part_response_id (@part_response_id) {
     my ($part_id,$resp_id) = @{ $part_response_id };      my ($part_id,$resp_id) = @{ $part_response_id };
  my $part_resp = join('_',@{ $part_response_id });   my $part_resp = join('_',@{ $part_response_id });
         if (($env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'} =~ /^\d+$/) & ($new_part eq $part_id)) {              if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $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 multiple files are uploaded names will be 'returndoc2','returndoc3'
  if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) {                  my $file_counter = 1;
                     my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'};   my $file_msg;
                   while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
                       my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
                     my ($directory,$answer_file) =                       my ($directory,$answer_file) = 
                         ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.*?)([^\/]*)$/);                          ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.*?)([^\/]*)$/);
                     my ($answer_name,$answer_ver,$answer_ext) =                      my ($answer_name,$answer_ver,$answer_ext) =
         &file_name_version_ext($answer_file);          &file_name_version_ext($answer_file);
     my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);      my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
                     my $getpropath = 1;                      my $getpropath = 1;
                     my ($dir_list,$listerror) =      my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,$domain,$stuname,$getpropath);
                         &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,      my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
                                                  $domain,$stuname,$getpropath);                      # fix file name
     my $version = &get_next_version($answer_name,$answer_ext,$dir_list);  
                     # fix filename  
                     my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);                      my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
                     my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,                      my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
                                            $newflg.'_'.$part_resp.'_returndoc'.$counter,                                             $newflg.'_'.$part_resp.'_returndoc'.$file_counter,
                                            $save_file_name);                                             $save_file_name);
                     if ($result !~ m|^/uploaded/|) {                      if ($result !~ m|^/uploaded/|) {
                         $request->print('<br /><span class="LC_error">'.                          $request->print('<br /><span class="LC_error">'.
                             &mt('An error occurred ([_1]) while trying to upload [_2].',                              &mt('An error occurred ([_1]) while trying to upload [_2].',
                                 $result,$newflg.'_'.$part_resp.'_returndoc'.$counter).                                  $result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter).
                                         '</span>');                                          '</span>');
                     } else {                      } else {
                         # mark the file as read only                          # mark the file as read only
                         push(@handedback,$save_file_name);                          my @files = ($save_file_name);
                           my @what = ($symb,$env{'request.course.id'},'handback');
                           &Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what);
  if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) {   if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) {
     $$newrecord{"resource.$new_part.$resp_id.handback"}.=',';      $$newrecord{"resource.$new_part.$resp_id.handback"}.=',';
  }   }
                         $$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;                          $$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;
  $file_msg.='<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />";   $file_msg.= "\n".'<br /><span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span><br />";
   
                     }                      }
                     $request->print('<br />'.&mt('[_1] will be the uploaded filename [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>'));                      $request->print("<br />".$fname." will be the uploaded file name");
                 }                      $request->print(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
                       $file_counter++;
                   }
    my $subject = "File Handed Back by Instructor ";
    my $message = "A file has been returned that was originally submitted in reponse to: <br />";
    $message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />";
    $message .= ' The returned file(s) are named: '. $file_msg;
    $message .= " and can be found in your portfolio space.";
    my ($feedurl,$showsymb) = 
       &get_feedurl_and_symb($symb,$domain,$stuname);
                   my $restitle = &Apache::lonnet::gettitle($symb);
    my $msgstatus = 
                      &Apache::lonmsg::user_normal_msg($stuname,$domain,$subject.
    ' (File Returned) ['.$restitle.']',$message,undef,
                            $feedurl,undef,undef,undef,$showsymb,$restitle);
             }              }
         }          }
     }  
     if (@handedback > 0) {  
         $request->print('<br />');  
         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 ($subject,$message);  
         if (scalar(@handedback) == 1) {  
             $subject = &mt_user($user_lh,'File Handed Back by Instructor');  
             $message = &mt_user($user_lh,'A file has been returned that was originally submitted in response to: ');  
         } else {  
             $subject = &mt_user($user_lh,'Files Handed Back by Instructor');  
             $message = &mt_user($user_lh,'Files have been returned that were originally submitted in response to: ');  
         }  
         $message .= "<p><strong>".&Apache::lonnet::gettitle($symb)." </strong></p>";  
         $message .= &mt_user($user_lh,'The returned file(s) are named: [_1]',"<br />$file_msg <br />").  
                     &mt_user($user_lh,'The file(s) can be found in your [_1]portfolio[_2].','<a href="/adm/portfolio">','</a>');  
         my ($feedurl,$showsymb) =  
             &get_feedurl_and_symb($symb,$domain,$stuname);  
         my $restitle = &Apache::lonnet::gettitle($symb);  
         $subject .= ' '.&mt_user($user_lh,'(File Returned)').' ['.$restitle.']';  
         my $msgstatus =  
              &Apache::lonmsg::user_normal_msg($stuname,$domain,$subject,  
                  $message,undef,$feedurl,undef,undef,undef,$showsymb,  
                  $restitle);  
         if ($msgstatus) {  
             $request->print(&mt('Notification message status: [_1]','<span class="LC_info">'.$msgstatus.'</span>').'<br />');  
         }  
     }  
     return;      return;
 }  }
   
Line 3704  sub version_portfiles { Line 3050  sub version_portfiles {
                 my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);                  my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
  my ($answer_name,$answer_ver,$answer_ext) =   my ($answer_name,$answer_ver,$answer_ext) =
     &file_name_version_ext($answer_file);      &file_name_version_ext($answer_file);
                 my $getpropath = 1;                  my $getpropath = 1;    
                 my ($dir_list,$listerror) =                  my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,$stu_name,$getpropath);
                     &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,                  my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
                                              $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);                  my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
                 if ($new_answer ne 'problem getting file') {                  if ($new_answer ne 'problem getting file') {
                     push(@versioned_portfiles, $directory.$new_answer);                      push(@versioned_portfiles, $directory.$new_answer);
Line 3727  sub version_portfiles { Line 3071  sub version_portfiles {
 sub get_next_version {  sub get_next_version {
     my ($answer_name, $answer_ext, $dir_list) = @_;      my ($answer_name, $answer_ext, $dir_list) = @_;
     my $version;      my $version;
     if (ref($dir_list) eq 'ARRAY') {      foreach my $row (@$dir_list) {
         foreach my $row (@{$dir_list}) {          my ($file) = split(/\&/,$row,2);
             my ($file) = split(/\&/,$row,2);          my ($file_name,$file_version,$file_ext) =
             my ($file_name,$file_version,$file_ext) =      &file_name_version_ext($file);
         &file_name_version_ext($file);          if (($file_name eq $answer_name) && 
             if (($file_name eq $answer_name) &&       ($file_ext eq $answer_ext)) {
         ($file_ext eq $answer_ext)) {                  # gets here if filename and extension match, regardless of version
                 # gets here if filename and extension match,   
                 # regardless of version  
                 if ($file_version ne '') {                  if ($file_version ne '') {
                     # a versioned file is found  so save it for later                  # a versioned file is found  so save it for later
                     if ($file_version > $version) {                  if ($file_version > $version) {
         $version = $file_version;      $version = $file_version;
                     }  
         }          }
             }              }
         }          }
     }      } 
     $version ++;      $version ++;
     return($version);      return($version);
 }  }
Line 3791  sub viewgrades_js { Line 3132  sub viewgrades_js {
     my ($request) = shift;      my ($request) = shift;
   
     my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');      my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
     &js_escape(\$alertmsg);  
     $request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT));      $request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT));
    function writePoint(partid,weight,point) {     function writePoint(partid,weight,point) {
  var radioButton = document.classgrade["RADVAL_"+partid];   var radioButton = document.classgrade["RADVAL_"+partid];
Line 3958  VIEWJAVASCRIPT Line 3298  VIEWJAVASCRIPT
   
 #--- show scores for a section or whole class w/ option to change/update a score  #--- show scores for a section or whole class w/ option to change/update a score
 sub viewgrades {  sub viewgrades {
     my ($request,$symb) = @_;      my ($request) = shift;
     &viewgrades_js($request);      &viewgrades_js($request);
   
       my ($symb) = &get_symb($request);
     #need to make sure we have the correct data for later EXT calls,       #need to make sure we have the correct data for later EXT calls, 
     #thus invalidate the cache      #thus invalidate the cache
     &Apache::lonnet::devalidatecourseresdata(      &Apache::lonnet::devalidatecourseresdata(
Line 3969  sub viewgrades { Line 3310  sub viewgrades {
     &Apache::lonnet::clear_EXT_cache_status();      &Apache::lonnet::clear_EXT_cache_status();
   
     my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';      my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';
       $result.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";
   
     #view individual student submission form - called using Javascript viewOneStudent      #view individual student submission form - called using Javascript viewOneStudent
     $result.=&jscriptNform($symb);      $result.=&jscriptNform($symb);
Line 3979  sub viewgrades { Line 3321  sub viewgrades {
  '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".   '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
  '<input type="hidden" name="command" value="editgrades" />'."\n".   '<input type="hidden" name="command" value="editgrades" />'."\n".
  &build_section_inputs().   &build_section_inputs().
    '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
  '<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".   '<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
    '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
   
     #retrieve selected groups      my ($common_header,$specific_header);
     my (@groups,$group_display);      if ($env{'form.section'} eq 'all') {
     @groups = &Apache::loncommon::get_env_multiple('form.group');   $common_header = &mt('Assign Common Grade to Class');
     if (grep(/^all$/,@groups)) {          $specific_header = &mt('Assign Grade to Specific Students in Class');
         @groups = ('all');      } elsif ($env{'form.section'} eq 'none') {
     } elsif (grep(/^none$/,@groups)) {          $common_header = &mt('Assign Common Grade to Students in no Section');
         @groups = ('none');   $specific_header = &mt('Assign Grade to Specific Students in no Section');
     } elsif (@groups > 0) {      } else {
         $group_display = join(', ',@groups);          my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
     }          $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);
     my ($common_header,$specific_header,@sections,$section_display);  
     @sections = &Apache::loncommon::get_env_multiple('form.section');  
     if (grep(/^all$/,@sections)) {  
         @sections = ('all');  
         if ($group_display) {  
             $common_header = &mt('Assign Common Grade to Students in Group(s) [_1]',$group_display);  
             $specific_header = &mt('Assign Grade to Specific Students in Group(s) [_1]',$group_display);  
         } elsif (grep(/^none$/,@groups)) {  
             $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');  
             $specific_header = &mt('Assign Grade to Specific Students in Class');  
         }  
     } elsif (grep(/^none$/,@sections)) {  
         @sections = ('none');  
         if ($group_display) {  
             $common_header = &mt('Assign Common Grade to Students in no Section and in Group(s) [_1]',$group_display);  
             $specific_header = &mt('Assign Grade to Specific Students in no Section and in Group(s)',$group_display);  
         } elsif (grep(/^none$/,@groups)) {  
             $common_header = &mt('Assign Common Grade to Students in no Section and in no Group');  
             $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');  
         }  
     } else {  
         $section_display = join (", ",@sections);  
         if ($group_display) {  
             $common_header = &mt('Assign Common Grade to Students in Section(s) [_1], and in Group(s) [_2]',  
                                  $section_display,$group_display);  
             $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1], and in Group(s) [_2]',  
                                    $section_display,$group_display);  
         } elsif (grep(/^none$/,@groups)) {  
             $common_header = &mt('Assign Common Grade to Students in Section(s) [_1] and no Group',$section_display);  
             $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);  
         }  
     }  
     my %submit_types = &substatus_options();  
     my $submission_status = $submit_types{$env{'form.submitonly'}};  
   
     if ($env{'form.submitonly'} eq 'all') {  
         $result.= '<h3>'.$common_header.'</h3>';  
     } else {  
         $result.= '<h3>'.$common_header.'&nbsp;'.&mt('(submission status: "[_1]")',$submission_status).'</h3>';   
     }      }
     $result .= &Apache::loncommon::start_data_table();      $result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();
     #radio buttons/text box for assigning points for a section or class.      #radio buttons/text box for assigning points for a section or class.
     #handles different parts of a problem      #handles different parts of a problem
     my $res_error;      my $res_error;
Line 4058  sub viewgrades { Line 3354  sub viewgrades {
  my $part_resp = join('_',@{ $part_response_id });   my $part_resp = join('_',@{ $part_response_id });
  next if $seen{$partid};   next if $seen{$partid};
  $seen{$partid}++;   $seen{$partid}++;
    my $handgrade=$$handgrade{$part_resp};
  my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);   my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
  $weight{$partid} = $wgt eq '' ? '1' : $wgt;   $weight{$partid} = $wgt eq '' ? '1' : $wgt;
   
Line 4076  sub viewgrades { Line 3373  sub viewgrades {
     $partid.'" size="4" '.'onchange="javascript:writePoint(\''.      $partid.'" size="4" '.'onchange="javascript:writePoint(\''.
  $partid.'\','.$weight{$partid}.',\'textval\')" /> /'.   $partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
     $weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";      $weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
  $line.= '<td><b>'.&mt('Grade Status').':</b>'.   $line.= '<td><b>'.&mt('Grade Status').':</b><select name="SELVAL_'.$partid.'"'.
                 '<select name="SELVAL_'.$partid.'" '.      'onchange="javascript:writeRadText(\''.$partid.'\','.
         'onchange="javascript:writeRadText(\''.$partid.'\','.  
  $weight{$partid}.')"> '.   $weight{$partid}.')"> '.
     '<option selected="selected"> </option>'.      '<option selected="selected"> </option>'.
     '<option value="excused">'.&mt('excused').'</option>'.      '<option value="excused">'.&mt('excused').'</option>'.
Line 4103  sub viewgrades { Line 3399  sub viewgrades {
   
     #table listing all the students in a section/class      #table listing all the students in a section/class
     #header of table      #header of table
     if ($env{'form.submitonly'} eq 'all') {       $result.= '<h3>'.$specific_header.'</h3>'.
         $result.= '<h3>'.$specific_header.'</h3>';                &Apache::loncommon::start_data_table().
     } else {  
         $result.= '<h3>'.$specific_header.'&nbsp;'.&mt('(submission status: "[_1]")',$submission_status).'</h3>';  
     }  
     $result.= &Apache::loncommon::start_data_table().  
       &Apache::loncommon::start_data_table_header_row().        &Apache::loncommon::start_data_table_header_row().
       '<th>'.&mt('No.').'</th>'.        '<th>'.&mt('No.').'</th>'.
       '<th>'.&nameUserString('header')."</th>\n";        '<th>'.&nameUserString('header')."</th>\n";
Line 4126  sub viewgrades { Line 3418  sub viewgrades {
  if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }   if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
  my ($partid) = &split_part_type($part);   my ($partid) = &split_part_type($part);
         push(@partids,$partid);          push(@partids,$partid);
 #  
 # FIXME: Looks like $display looks at English text  
 #  
  my $display_part=&get_display_part($partid,$symb);   my $display_part=&get_display_part($partid,$symb);
  if ($display =~ /^Partial Credit Factor/) {   if ($display =~ /^Partial Credit Factor/) {
     $result.='<th>'.      $result.='<th>'.
                 &mt('Score Part: [_1][_2](weight = [_3])',   &mt('Score Part: [_1]<br /> (weight = [_2])',
                     $display_part,'<br />',$weight{$partid}).'</th>'."\n";      $display_part,$weight{$partid}).'</th>'."\n";
     next;      next;
           
  } else {   } else {
Line 4154  sub viewgrades { Line 3443  sub viewgrades {
   
     #get info for each student      #get info for each student
     #list all the students - with points and grade status      #list all the students - with points and grade status
     my (undef,undef,$fullname) = &getclasslist(\@sections,'1',\@groups);      my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
     my $ctr = 0;      my $ctr = 0;
     foreach (sort       foreach (sort 
      {       {
Line 4163  sub viewgrades { Line 3452  sub viewgrades {
  }   }
  return $a cmp $b;   return $a cmp $b;
      } (keys(%$fullname))) {       } (keys(%$fullname))) {
    $ctr++;
  $result.=&viewstudentgrade($symb,$env{'request.course.id'},   $result.=&viewstudentgrade($symb,$env{'request.course.id'},
    $_,$$fullname{$_},\@parts,\%weight,\$ctr,\%last_resets);     $_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
     }      }
     $result.=&Apache::loncommon::end_data_table();      $result.=&Apache::loncommon::end_data_table();
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";      $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
     $result.='<input type="button" value="'.&mt('Save').'" '.      $result.='<input type="button" value="'.&mt('Save').'" '.
  'onclick="javascript:submit();" target="_self" /></form>'."\n";   'onclick="javascript:submit();" target="_self" /></form>'."\n";
     if ($ctr == 0) {      if (scalar(%$fullname) eq 0) {
    my $colspan=3+scalar(@parts);
    my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
         my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));          my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
         $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'.   $result='<span class="LC_warning">'.
                 '<span class="LC_warning">';      &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
         if ($env{'form.submitonly'} eq 'all') {          $section_display, $stu_status).
             if (grep(/^all$/,@sections)) {      '</span>';
                 if (grep(/^all$/,@groups)) {  
                     $result .= &mt('There are no students with enrollment status [_1] to modify or grade.',  
                                    $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);  
                 } else {  
                     $result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] to modify or grade.',  
                                    $group_display,$stu_status);  
                 }  
             } elsif (grep(/^none$/,@sections)) {  
                 if (grep(/^all$/,@groups)) {  
                     $result .= &mt('There are no students in no section with enrollment status [_1] to modify or grade.',  
                                    $stu_status);  
                 } elsif (grep(/^none$/,@groups)) {  
                     $result .= &mt('There are no students in no section and no group with enrollment status [_1] to modify or grade.',  
                                    $stu_status);  
                 } else {  
                     $result .= &mt('There are no students in no section in group(s) [_1] with enrollment status [_2] to modify or grade.',  
                                    $group_display,$stu_status);  
                 }  
             } else {  
                 if (grep(/^all$/,@groups)) {  
                     $result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',  
                                    $section_display,$stu_status);  
                 } elsif (grep(/^none$/,@groups)) {  
                     $result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] to modify or grade.',  
                                    $section_display,$stu_status);  
                 } else {  
                     $result .= &mt('There are no students in section(s) [_1] and group(s) [_2] with enrollment status [_3] to modify or grade.',  
                                    $section_display,$group_display,$stu_status);  
                 }  
             }  
         } else {  
             if (grep(/^all$/,@sections)) {  
                 if (grep(/^all$/,@groups)) {  
                     $result .= &mt('There are no students with enrollment status [_1] and submission status "[_2]" to modify or grade.',  
                                    $stu_status,$submission_status);  
                 } elsif (grep(/^none$/,@groups)) {  
                     $result .= &mt('There are no students with no group assigned with enrollment status [_1] and submission status "[_2]" to modify or grade.',  
                                    $stu_status,$submission_status);  
                 } else {  
                     $result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',  
                                    $group_display,$stu_status,$submission_status);  
                 }  
             } elsif (grep(/^none$/,@sections)) {  
                 if (grep(/^all$/,@groups)) {  
                     $result .= &mt('There are no students in no section with enrollment status [_1] and submission status "[_2]" to modify or grade.',  
                                    $stu_status,$submission_status);  
                 } elsif (grep(/^none$/,@groups)) {  
                     $result .= &mt('There are no students in no section and no group with enrollment status [_1] and submission status "[_2]" to modify or grade.',  
                                    $stu_status,$submission_status);  
                 } else {  
                     $result .= &mt('There are no students in no section in group(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',  
                                    $group_display,$stu_status,$submission_status);  
                 }  
             } 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);  
                 } 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);  
                 } else {  
                     $result .= &mt('There are no students in section(s) [_1] and group(s) [_2] with enrollment status [_3] and submission status "[_4]" to modify or grade.',  
                                    $section_display,$group_display,$stu_status,$submission_status);  
                 }  
             }  
  }  
  $result .= '</span><br />';  
     }      }
       $result.=&show_grading_menu_form($symb);
     return $result;      return $result;
 }  }
   
 #--- call by previous routine to display each student who satisfies submission filter.  #--- call by previous routine to display each student
 sub viewstudentgrade {  sub viewstudentgrade {
     my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;      my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
     my ($uname,$udom) = split(/:/,$student);      my ($uname,$udom) = split(/:/,$student);
     my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);      my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
     my $submitonly = $env{'form.submitonly'};      my %aggregates = (); 
     unless (($submitonly eq 'all') || ($submitonly eq 'queued')) {  
         my %partstatus = ();  
         if (ref($parts) eq 'ARRAY') {  
             foreach my $apart (@{$parts}) {  
                 my ($part,$type) = &split_part_type($apart);  
                 my ($status,undef) = split(/_/,$record{"resource.$part.solved"},2);  
                 $status = 'nothing' if ($status eq '');  
                 $partstatus{$part}      = $status;  
                 my $subkey = "resource.$part.submitted_by";  
                 $partstatus{$subkey} = $record{$subkey} if ($record{$subkey} ne '');  
             }  
             my $submitted = 0;  
             my $graded = 0;  
             my $incorrect = 0;  
             foreach my $key (keys(%partstatus)) {  
                 $submitted = 1 if ($partstatus{$key} ne 'nothing');  
                 $graded = 1 if ($partstatus{$key} =~ /^ungraded/);  
                 $incorrect = 1 if ($partstatus{$key} =~ /^incorrect/);  
   
                 my $partid = (split(/\./,$key))[1];  
                 if ($partstatus{'resource.'.$partid.'.'.$key.'.submitted_by'} ne '') {  
                     $submitted = 0;  
                 }  
             }  
             return if (!$submitted && ($submitonly eq 'yes' ||  
                                        $submitonly eq 'incorrect' ||  
                                        $submitonly eq 'graded'));  
             return if (!$graded && ($submitonly eq 'graded'));  
             return if (!$incorrect && $submitonly eq 'incorrect');  
         }  
     }  
     if ($submitonly eq 'queued') {  
         my ($cdom,$cnum) = split(/_/,$courseid);  
         my %queue_status =  
             &Apache::bridgetask::get_student_status($symb,$cdom,$cnum,  
                                                     $udom,$uname);  
         return if (!defined($queue_status{'gradingqueue'}));  
     }  
     $$ctr++;  
     my %aggregates = ();  
     my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'.      my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'.
  '<input type="hidden" name="ctr'.($$ctr-1).'" value="'.$student.'" />'.   '<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.
  "\n".$$ctr.'&nbsp;</td><td>&nbsp;'.   "\n".$ctr.'&nbsp;</td><td>&nbsp;'.
  '<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.   '<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
  '\');" target="_self">'.$fullname.'</a> '.   '\');" target="_self">'.$fullname.'</a> '.
  '<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n";   '<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n";
Line 4358  sub viewstudentgrade { Line 3541  sub viewstudentgrade {
 #--- change scores for all the students in a section/class  #--- change scores for all the students in a section/class
 #    record does not get update if unchanged  #    record does not get update if unchanged
 sub editgrades {  sub editgrades {
     my ($request,$symb) = @_;      my ($request) = @_;
   
       my $symb=&get_symb($request);
     my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));      my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
     my $title='<h2>'.&mt('Current Grade Status').'</h2>';      my $title='<h2>'.&mt('Current Grade Status').'</h2>';
     $title.='<h4><b>'.&mt('Section:').'</b> '.$section_display.'</h4>'."\n";      $title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";
       $title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n";
   
     my $result= &Apache::loncommon::start_data_table().      my $result= &Apache::loncommon::start_data_table().
  &Apache::loncommon::start_data_table_header_row().   &Apache::loncommon::start_data_table_header_row().
Line 4396  sub editgrades { Line 3581  sub editgrades {
  $ctr++;   $ctr++;
     }      }
     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);      my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
     my $totcolspan = 0;  
     foreach my $partid (@partid) {      foreach my $partid (@partid) {
  $header .= '<th align="center">'.&mt('Old Score').'</th>'.   $header .= '<th align="center">'.&mt('Old Score').'</th>'.
     '<th align="center">'.&mt('New Score').'</th>';      '<th align="center">'.&mt('New Score').'</th>';
Line 4413  sub editgrades { Line 3597  sub editgrades {
  '<th align="center">'.&mt('New').' '.$display.'</th>';   '<th align="center">'.&mt('New').' '.$display.'</th>';
     $columns{$partid}+=2;      $columns{$partid}+=2;
  }   }
         $totcolspan += $columns{$partid};  
     }      }
     foreach my $partid (@partid) {      foreach my $partid (@partid) {
  my $display_part=&get_display_part($partid,$symb);   my $display_part=&get_display_part($partid,$symb);
Line 4429  sub editgrades { Line 3612  sub editgrades {
     my @noupdate;      my @noupdate;
     my ($updateCtr,$noupdateCtr) = (1,1);      my ($updateCtr,$noupdateCtr) = (1,1);
     for ($i=0; $i<$env{'form.total'}; $i++) {      for ($i=0; $i<$env{'form.total'}; $i++) {
    my $line;
  my $user = $env{'form.ctr'.$i};   my $user = $env{'form.ctr'.$i};
  my ($uname,$udom)=split(/:/,$user);   my ($uname,$udom)=split(/:/,$user);
  my %newrecord;   my %newrecord;
  my $updateflag = 0;   my $updateflag = 0;
         my $usec=$classlist->{"$uname:$udom"}[5];   $line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
         my $canmodify = &canmodify($usec);   my $usec=$classlist->{"$uname:$udom"}[5];
         my $line = '<td'.($canmodify?'':' colspan="2"').'>'.   if (!&canmodify($usec)) {
                    &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';      my $numcols=scalar(@partid)*4+2;
         if (!$canmodify) {      push(@noupdate,
             push(@noupdate,   $line."<td colspan=\"$numcols\"><span class=\"LC_warning\">".
                  $line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">".   &mt('Not allowed to modify student')."</span></td></tr>");
                  &mt('Not allowed to modify student')."</span></td>");      next;
             next;   }
         }  
         my %aggregate = ();          my %aggregate = ();
         my $aggregateflag = 0;          my $aggregateflag = 0;
  $user=~s/:/_/; # colon doen't work in javascript for names   $user=~s/:/_/; # colon doen't work in javascript for names
Line 4557  sub editgrades { Line 3740  sub editgrades {
         }          }
     }      }
     if (@noupdate) {      if (@noupdate) {
         my $numcols=$totcolspan+2;  # my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
    my $numcols=scalar(@partid)*4+2;
  $result .= &Apache::loncommon::start_data_table_row('LC_empty_row').   $result .= &Apache::loncommon::start_data_table_row('LC_empty_row').
     '<td align="center" colspan="'.$numcols.'">'.      '<td align="center" colspan="'.$numcols.'">'.
     &mt('No Changes Occurred For the Students Below').      &mt('No Changes Occurred For the Students Below').
Line 4570  sub editgrades { Line 3754  sub editgrades {
  &Apache::loncommon::end_data_table_row();   &Apache::loncommon::end_data_table_row();
  }   }
     }      }
     $result .= &Apache::loncommon::end_data_table();      $result .= &Apache::loncommon::end_data_table().
    &show_grading_menu_form($symb);
     my $msg = '<p><b>'.      my $msg = '<p><b>'.
  &mt('Number of records updated = [_1] for [quant,_2,student].',   &mt('Number of records updated = [_1] for [quant,_2,student].',
     $rec_update,$count).'</b><br />'.      $rec_update,$count).'</b><br />'.
Line 4600  sub split_part_type { Line 3785  sub split_part_type {
 sub csvupload_javascript_reverse_associate {  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 or the student/employee ID');
     my $error2=&mt('You need to specify at least one grading field');      my $error2=&mt('You need to specify at least one grading field');
   &js_escape(\$error1);  
   &js_escape(\$error2);  
   return(<<ENDPICK);    return(<<ENDPICK);
   function verify(vf) {    function verify(vf) {
     var foundsomething=0;      var foundsomething=0;
Line 4642  ENDPICK Line 3825  ENDPICK
 sub csvupload_javascript_forward_associate {  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 or the student/employee ID');
     my $error2=&mt('You need to specify at least one grading field');      my $error2=&mt('You need to specify at least one grading field');
   &js_escape(\$error1);  
   &js_escape(\$error2);  
   return(<<ENDPICK);    return(<<ENDPICK);
   function verify(vf) {    function verify(vf) {
     var foundsomething=0;      var foundsomething=0;
Line 4687  sub csvuploadmap_header { Line 3868  sub csvuploadmap_header {
  $javascript=&csvupload_javascript_forward_associate();   $javascript=&csvupload_javascript_forward_associate();
     }      }
   
   #    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
       my $result='';
     my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');      my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
     my $ignore=&mt('Ignore First Line');      my $ignore=&mt('Ignore First Line');
     $symb = &Apache::lonenc::check_encrypt($symb);      $symb = &Apache::lonenc::check_encrypt($symb);
     $request->print('<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">'.  
                     &mt('Total number of records found in file: [_1]',$distotal).'<hr />'.  
                     &mt('Associate entries from the uploaded file with as many fields as you can.'));  
     my $reverse=&mt("Reverse Association");  
     $request->print(<<ENDPICK);      $request->print(<<ENDPICK);
 <br />  <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <input type="button" value="$reverse" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />  <h3><span class="LC_info">Uploading Class Grades</span></h3>
   $result
   <hr />
   <h3>Identify fields</h3>
   Total number of records found in file: $distotal <hr />
   Enter as many fields as you can. The system will inform you and bring you back
   to this page if the data selected is insufficient to run your class.<hr />
   <input type="button" value="Reverse Association" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
 <label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>  <label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
 <input type="hidden" name="associate"  value="" />  <input type="hidden" name="associate"  value="" />
 <input type="hidden" name="phase"      value="three" />  <input type="hidden" name="phase"      value="three" />
Line 4706  sub csvuploadmap_header { Line 3892  sub csvuploadmap_header {
 <input type="hidden" name="upfile_associate"   <input type="hidden" name="upfile_associate" 
                                        value="$env{'form.upfile_associate'}" />                                         value="$env{'form.upfile_associate'}" />
 <input type="hidden" name="symb"       value="$symb" />  <input type="hidden" name="symb"       value="$symb" />
   <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
   <input type="hidden" name="probTitle"  value="$env{'form.probTitle'}" />
 <input type="hidden" name="command"    value="csvuploadoptions" />  <input type="hidden" name="command"    value="csvuploadoptions" />
 <hr />  <hr />
 ENDPICK  ENDPICK
Line 4743  sub csvupload_fields { Line 3931  sub csvupload_fields {
   
 sub csvuploadmap_footer {  sub csvuploadmap_footer {
     my ($request,$i,$keyfields) =@_;      my ($request,$i,$keyfields) =@_;
     my $buttontext = &mt('Assign Grades');  
     $request->print(<<ENDPICK);      $request->print(<<ENDPICK);
 </table>  </table>
 <input type="hidden" name="nfields" value="$i" />  <input type="hidden" name="nfields" value="$i" />
 <input type="hidden" name="keyfields" value="$keyfields" />  <input type="hidden" name="keyfields" value="$keyfields" />
 <input type="button" onclick="javascript:verify(this.form)" value="$buttontext" /><br />  <input type="button" onclick="javascript:verify(this.form)" value="Assign Grades" /><br />
 </form>  </form>
 ENDPICK  ENDPICK
 }  }
   
 sub checkforfile_js {  sub checkforfile_js {
     my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');      my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
     &js_escape(\$alertmsg);  
     my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS);      my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS);
     function checkUpload(formname) {      function checkUpload(formname) {
  if (formname.upfile.value == "") {   if (formname.upfile.value == "") {
Line 4769  CSVFORMJS Line 3955  CSVFORMJS
 }  }
   
 sub upcsvScores_form {  sub upcsvScores_form {
     my ($request,$symb) = @_;      my ($request) = shift;
       my ($symb)=&get_symb($request);
     if (!$symb) {return '';}      if (!$symb) {return '';}
     my $result=&checkforfile_js();      my $result=&checkforfile_js();
     $result.=&Apache::loncommon::start_data_table().      $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
              &Apache::loncommon::start_data_table_header_row().  #    my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
              '<th>'.&mt('Specify a file containing the class scores for current resource.').'</th>'.  #    $result.=$table;
              &Apache::loncommon::end_data_table_header_row().      $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
              &Apache::loncommon::start_data_table_row().'<td>';      $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
       $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource.').
    '</b></td></tr>'."\n";
       $result.='<tr bgcolor=#ffffe6><td>'."\n";
     my $upload=&mt("Upload Scores");      my $upload=&mt("Upload Scores");
     my $upfile_select=&Apache::loncommon::upfile_select_html();      my $upfile_select=&Apache::loncommon::upfile_select_html();
     my $ignore=&mt('Ignore First Line');      my $ignore=&mt('Ignore First Line');
Line 4785  sub upcsvScores_form { Line 3975  sub upcsvScores_form {
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">  <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <input type="hidden" name="symb" value="$symb" />  <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="command" value="csvuploadmap" />  <input type="hidden" name="command" value="csvuploadmap" />
   <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
   <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 $upfile_select  $upfile_select
 <br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />  <br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
 <label><input type="checkbox" name="noFirstLine" />$ignore</label>  <label><input type="checkbox" name="noFirstLine" />$ignore</label>
 </form>  </form>
 ENDUPFORM  ENDUPFORM
     $result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",      $result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
                            &mt("How do I create a CSV file from a spreadsheet")).                             &mt("How do I create a CSV file from a spreadsheet"))
             '</td>'.      .'</td></tr></table>'."\n";
             &Apache::loncommon::end_data_table_row().      $result.='</td></tr></table><br /><br />'."\n";
             &Apache::loncommon::end_data_table();      $result.=&show_grading_menu_form($symb);
     return $result;      return $result;
 }  }
   
   
 sub csvuploadmap {  sub csvuploadmap {
     my ($request,$symb) = @_;      my ($request)= @_;
       my ($symb)=&get_symb($request);
     if (!$symb) {return '';}      if (!$symb) {return '';}
   
     my $datatoken;      my $datatoken;
     if (!$env{'form.datatoken'}) {      if (!$env{'form.datatoken'}) {
  $datatoken=&Apache::loncommon::upfile_store($request);   $datatoken=&Apache::loncommon::upfile_store($request);
     } else {      } else {
         $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});   $datatoken=$env{'form.datatoken'};
         if ($datatoken ne '') {    &Apache::loncommon::load_tmp_file($request);
     &Apache::loncommon::load_tmp_file($request,$datatoken);  
         }  
     }      }
     my @records=&Apache::loncommon::upfile_record_sep();      my @records=&Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@records); }      if ($env{'form.noFirstLine'}) { shift(@records); }
Line 4843  sub csvuploadmap { Line 4034  sub csvuploadmap {
  }   }
     }      }
     &csvuploadmap_footer($request,$i,$keyfields);      &csvuploadmap_footer($request,$i,$keyfields);
       $request->print(&show_grading_menu_form($symb));
   
     return '';      return '';
 }  }
   
 sub csvuploadoptions {  sub csvuploadoptions {
     my ($request,$symb)= @_;      my ($request)= @_;
     my $overwrite=&mt('Overwrite any existing score');      my ($symb)=&get_symb($request);
     my $checked=(($env{'form.noFirstLine'})?'1':'0');      my $checked=(($env{'form.noFirstLine'})?'1':'0');
     my $ignore=&mt('Ignore First Line');      my $ignore=&mt('Ignore First Line');
     $request->print(<<ENDPICK);      $request->print(<<ENDPICK);
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">  <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
   <h3><span class="LC_info">Uploading Class Grade Options</span></h3>
 <input type="hidden" name="command"    value="csvuploadassign" />  <input type="hidden" name="command"    value="csvuploadassign" />
   <!--
   <p>
   <label>
      <input type="checkbox" name="show_full_results" />
      Show a table of all changes
   </label>
   </p>
   -->
 <p>  <p>
 <label>  <label>
    <input type="checkbox" name="overwite_scores" checked="checked" />     <input type="checkbox" name="overwite_scores" checked="checked" />
    $overwrite     Overwrite any existing score
 </label>  </label>
 </p>  </p>
 ENDPICK  ENDPICK
     my %fields=&get_fields();      my %fields=&get_fields();
     if (!defined($fields{'domain'})) {      if (!defined($fields{'domain'})) {
  my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');   my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');
         $request->print("\n<p>".&mt('Users are in domain: [_1]',$domform)."</p>\n");   $request->print("\n<p> Users are in domain: ".$domform."</p>\n");
     }      }
     foreach my $key (sort(keys(%env))) {      foreach my $key (sort(keys(%env))) {
  if ($key !~ /^form\.(.*)$/) { next; }   if ($key !~ /^form\.(.*)$/) { next; }
Line 4876  ENDPICK Line 4077  ENDPICK
     }      }
     # FIXME do a check for any duplicated user ids...      # FIXME do a check for any duplicated user ids...
     # FIXME do a check for any invalid user ids?...      # FIXME do a check for any invalid user ids?...
     $request->print('<input type="submit" value="'.&mt('Assign Grades').'" /><br />      $request->print('<input type="submit" value="Assign Grades" /><br />
 <hr /></form>'."\n");  <hr /></form>'."\n");
       $request->print(&show_grading_menu_form($symb));
     return '';      return '';
 }  }
   
Line 4899  sub get_fields { Line 4101  sub get_fields {
 }  }
   
 sub csvuploadassign {  sub csvuploadassign {
     my ($request,$symb) = @_;      my ($request)= @_;
       my ($symb)=&get_symb($request);
     if (!$symb) {return '';}      if (!$symb) {return '';}
     my $error_msg = '';      my $error_msg = '';
     my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});      &Apache::loncommon::load_tmp_file($request);
     if ($datatoken ne '') {  
         &Apache::loncommon::load_tmp_file($request,$datatoken);  
     }  
     my @gradedata = &Apache::loncommon::upfile_record_sep();      my @gradedata = &Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@gradedata); }      if ($env{'form.noFirstLine'}) { shift(@gradedata); }
     my %fields=&get_fields();      my %fields=&get_fields();
       $request->print('<h3>Assigning Grades</h3>');
     my $courseid=$env{'request.course.id'};      my $courseid=$env{'request.course.id'};
     my ($classlist) = &getclasslist('all',0);      my ($classlist) = &getclasslist('all',0);
     my @notallowed;      my @notallowed;
     my @skipped;      my @skipped;
     my @warnings;  
     my $countdone=0;      my $countdone=0;
     foreach my $grade (@gradedata) {      foreach my $grade (@gradedata) {
  my %entries=&Apache::loncommon::record_sep($grade);   my %entries=&Apache::loncommon::record_sep($grade);
Line 4962  sub csvuploadassign { Line 4162  sub csvuploadassign {
                     my $pcr=$entries{$fields{$dest}} / $wgt;                      my $pcr=$entries{$fields{$dest}} / $wgt;
                     my $award=($pcr == 0) ? 'incorrect_by_override'                      my $award=($pcr == 0) ? 'incorrect_by_override'
                                           : 'correct_by_override';                                            : 'correct_by_override';
                     if ($pcr>1) {  
                         push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain"));  
                     }  
                     $grades{"resource.$part.awarded"}=$pcr;                      $grades{"resource.$part.awarded"}=$pcr;
                     $grades{"resource.$part.solved"}=$award;                      $grades{"resource.$part.solved"}=$award;
                     $points{$part}=1;                      $points{$part}=1;
Line 4984  sub csvuploadassign { Line 4181  sub csvuploadassign {
  $grades{$store_key}=$entries{$fields{$dest}};   $grades{$store_key}=$entries{$fields{$dest}};
     }      }
  }   }
  if (! %grades) {   if (! %grades) { 
            push(@skipped,&mt("[_1]: no data to save","$username:$domain"));              push(@skipped,&mt("[_1]: no data to save","$username:$domain")); 
         } else {          } else {
    $grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";     $grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
Line 4992  sub csvuploadassign { Line 4189  sub csvuploadassign {
    $env{'request.course.id'},     $env{'request.course.id'},
    $domain,$username);     $domain,$username);
    if ($result eq 'ok') {     if ($result eq 'ok') {
 # Successfully stored  
       $request->print('.');        $request->print('.');
 # Remove from grading queue  
               &Apache::bridgetask::remove_from_queue('gradingqueue',$symb,  
                                              $env{'course.'.$env{'request.course.id'}.'.domain'},  
                                              $env{'course.'.$env{'request.course.id'}.'.num'},  
                                              $domain,$username);  
    } else {     } else {
       $request->print("<p><span class=\"LC_error\">".        $request->print("<p><span class=\"LC_error\">".
                               &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",                                &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",
Line 5009  sub csvuploadassign { Line 4200  sub csvuploadassign {
         }          }
     }      }
     $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));      $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));
     if (@warnings) {  
         $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('Warnings generated for the following saved scores:'),1).'<br />');  
         $request->print(join(', ',@warnings));  
     }  
     if (@skipped) {      if (@skipped) {
  $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />');   $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />');
         $request->print(join(', ',@skipped));          $request->print(join(', ',@skipped));
Line 5022  sub csvuploadassign { Line 4209  sub csvuploadassign {
  $request->print(join(', ',@notallowed));   $request->print(join(', ',@notallowed));
     }      }
     $request->print("<br />\n");      $request->print("<br />\n");
       $request->print(&show_grading_menu_form($symb));
     return $error_msg;      return $error_msg;
 }  }
 #------------- end of section for handling csv file upload ---------  #------------- end of section for handling csv file upload ---------
Line 5032  sub csvuploadassign { Line 4220  sub csvuploadassign {
 #  #
 #--- Select a page/sequence and a student to grade  #--- Select a page/sequence and a student to grade
 sub pickStudentPage {  sub pickStudentPage {
     my ($request,$symb) = @_;      my ($request) = shift;
   
     my $alertmsg = &mt('Please select the student you wish to grade.');      my $alertmsg = &mt('Please select the student you wish to grade.');
     &js_escape(\$alertmsg);  
     $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));      $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
   
 function checkPickOne(formname) {  function checkPickOne(formname) {
Line 5051  function checkPickOne(formname) { Line 4238  function checkPickOne(formname) {
   
 LISTJAVASCRIPT  LISTJAVASCRIPT
     &commonJSfunctions($request);      &commonJSfunctions($request);
       my ($symb) = &get_symb($request);
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};      my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};      my $cnum      = $env{"course.$env{'request.course.id'}.num"};
     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};      my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
     my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};  
   
     my $result='<h3><span class="LC_info">&nbsp;'.      my $result='<h3><span class="LC_info">&nbsp;'.
  &mt('Manual Grading by Page or Sequence').'</span></h3>';   &mt('Manual Grading by Page or Sequence').'</span></h3>';
Line 5070  LISTJAVASCRIPT Line 4256  LISTJAVASCRIPT
     my ($curpage) =&Apache::lonnet::decode_symb($symb);       my ($curpage) =&Apache::lonnet::decode_symb($symb); 
 #    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);   #    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); 
 #    my $type=($curpage =~ /\.(page|sequence)/);  #    my $type=($curpage =~ /\.(page|sequence)/);
       my $select = '<select name="selectpage">'."\n";
     # Collection of hidden fields  
     my $ctr=0;      my $ctr=0;
     foreach (@$titles) {      foreach (@$titles) {
  my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);   my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
    $select.='<option value="'.$ctr.'" '.
       ($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
       '>'.$showtitle.'</option>'."\n";
    $ctr++;
       }
       $select.= '</select>';
       $result.='&nbsp;<b>'.&mt('Problems from').':</b> '.$select."<br />\n";
   
       $ctr=0;
       foreach (@$titles) {
    my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
  $result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n";   $result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n";
  $result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n";   $result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n";
  $ctr++;   $ctr++;
Line 5082  LISTJAVASCRIPT Line 4278  LISTJAVASCRIPT
     $result.='<input type="hidden" name="page" />'."\n".      $result.='<input type="hidden" name="page" />'."\n".
  '<input type="hidden" name="title" />'."\n";   '<input type="hidden" name="title" />'."\n";
   
       my $options =
    '<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
    '<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n";
       $result.='&nbsp;<b>'.&mt('View Problem Text').': </b>'.$options;
   
       $options =
    '<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n".
    '<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n".
    '<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n";
       $result.='&nbsp;<b>'.&mt('Submissions').': </b>'.$options;
       
     $result.=&build_section_inputs();      $result.=&build_section_inputs();
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));      my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
     $result.='<input type="hidden" name="Status"  value="'.$stu_status.'" />'."\n".      $result.='<input type="hidden" name="Status"  value="'.$stu_status.'" />'."\n".
         '<input type="hidden" name="command" value="displayPage" />'."\n".   '<input type="hidden" name="command" value="displayPage" />'."\n".
         '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";   '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
    '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
     # Show grading options  
     $result.=&Apache::lonhtmlcommon::start_pick_box();  
     my $select = '<select name="selectpage">'."\n";  
     $ctr=0;  
     foreach (@$titles) {  
         my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);  
         $select.='<option value="'.$ctr.'"'.  
             ($$symbx{$_} =~ /$curpage$/ ? ' selected="selected"' : '').  
             '>'.$showtitle.'</option>'."\n";  
         $ctr++;  
     }  
     $select.= '</select>';  
   
     $result.=      $result.='&nbsp;<b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";
         &Apache::lonhtmlcommon::row_title(&mt('Problems from'))  
        .$select  
        .&Apache::lonhtmlcommon::row_closure();  
   
     $result.=  
         &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))  
        .'<label><input type="radio" name="vProb" value="no"'  
            .' checked="checked" /> '.&mt('no').' </label>'."\n"  
        .'<label><input type="radio" name="vProb" value="yes" />'  
            .&mt('yes').'</label>'."\n"  
        .&Apache::lonhtmlcommon::row_closure();  
   
     $result.=  
         &Apache::lonhtmlcommon::row_title(&mt('View Submissions'))  
        .'<label><input type="radio" name="lastSub" value="none" /> '  
            .&mt('none').' </label>'."\n"  
        .'<label><input type="radio" name="lastSub" value="datesub"'  
            .' checked="checked" /> '.&mt('all submissions').'</label>'."\n"  
        .'<label><input type="radio" name="lastSub" value="all" /> '  
            .&mt('all submissions with details').' </label>'  
        .&Apache::lonhtmlcommon::row_closure();  
   
     $result.=  
         &Apache::lonhtmlcommon::row_title(&mt('Use CODE'))  
        .'<input type="text" name="CODE" value="" />'  
        .&Apache::lonhtmlcommon::row_closure(1)  
        .&Apache::lonhtmlcommon::end_pick_box();  
   
     # Show list of students to select for grading      $result.='&nbsp;<input type="button" '.
     $result.='<br /><input type="button" '.  
              'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /><br />'."\n";               'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /><br />'."\n";
   
     $request->print($result);      $request->print($result);
Line 5145  LISTJAVASCRIPT Line 4312  LISTJAVASCRIPT
  '<th>'.&nameUserString('header').'</th>'.   '<th>'.&nameUserString('header').'</th>'.
  &Apache::loncommon::end_data_table_header_row();   &Apache::loncommon::end_data_table_header_row();
     
     my (undef,undef,$fullname) = &getclasslist($getsec,'1',$getgroup);      my (undef,undef,$fullname) = &getclasslist($getsec,'1');
     my $ptr = 1;      my $ptr = 1;
     foreach my $student (sort       foreach my $student (sort 
  {   {
Line 5173  LISTJAVASCRIPT Line 4340  LISTJAVASCRIPT
     $studentTable.='<input type="button" '.      $studentTable.='<input type="button" '.
                    'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /></form>'."\n";                     'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /></form>'."\n";
   
       $studentTable.=&show_grading_menu_form($symb);
     $request->print($studentTable);      $request->print($studentTable);
   
     return '';      return '';
Line 5209  sub getSymbMap { Line 4377  sub getSymbMap {
 #  #
 #--- Displays a page/sequence w/wo problems, w/wo submissions  #--- Displays a page/sequence w/wo problems, w/wo submissions
 sub displayPage {  sub displayPage {
     my ($request,$symb) = @_;      my ($request) = shift;
   
       my ($symb) = &get_symb($request);
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};      my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};      my $cnum      = $env{"course.$env{'request.course.id'}.num"};
     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};      my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
Line 5226  sub displayPage { Line 4396  sub displayPage {
     &Apache::lonnet::clear_EXT_cache_status();      &Apache::lonnet::clear_EXT_cache_status();
   
     if (!&canview($usec)) {      if (!&canview($usec)) {
  $request->print(   $request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>');
             '<span class="LC_warning">'.   $request->print(&show_grading_menu_form($symb));
             &mt('Unable to view requested student. ([_1])',   return;
                 $env{'form.student'}).  
             '</span>');  
         return;  
     }      }
     my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';      my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
     $result.='<h3>&nbsp;'.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).      $result.='<h3>&nbsp;'.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).
Line 5248  sub displayPage { Line 4415  sub displayPage {
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
     unless (ref($navmap)) {      unless (ref($navmap)) {
         $request->print(&navmap_errormsg());          $request->print(&navmap_errormsg());
           $request->print(&show_grading_menu_form($symb));
         return;          return;
     }      }
     my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});      my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps      my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {      if (!$map) {
  $request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>');   $request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>');
    $request->print(&show_grading_menu_form($symb));
  return;    return; 
     }      }
     my $iterator = $navmap->getIterator($map->map_start(),      my $iterator = $navmap->getIterator($map->map_start(),
Line 5266  sub displayPage { Line 4435  sub displayPage {
  '<input type="hidden" name="page"    value="'.$pageTitle.'" />'."\n".   '<input type="hidden" name="page"    value="'.$pageTitle.'" />'."\n".
  '<input type="hidden" name="title"   value="'.$env{'form.title'}.'" />'."\n".   '<input type="hidden" name="title"   value="'.$env{'form.title'}.'" />'."\n".
  '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".   '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
  '<input type="hidden" name="overRideScore" value="no" />'."\n";   '<input type="hidden" name="overRideScore" value="no" />'."\n".
    '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
   
     if (defined($env{'form.CODE'})) {      if (defined($env{'form.CODE'})) {
  $studentTable.=   $studentTable.=
Line 5280  sub displayPage { Line 4450  sub displayPage {
         '</span>'."\n".          '</span>'."\n".
  &Apache::loncommon::start_data_table().   &Apache::loncommon::start_data_table().
  &Apache::loncommon::start_data_table_header_row().   &Apache::loncommon::start_data_table_header_row().
  '<th>'.&mt('Prob.').'</th>'.   '<th align="center">&nbsp;Prob.&nbsp;</th>'.
  '<th>&nbsp;'.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'.   '<th>&nbsp;'.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'.
  &Apache::loncommon::end_data_table_header_row();   &Apache::loncommon::end_data_table_header_row();
   
Line 5300  sub displayPage { Line 4470  sub displayPage {
  &Apache::loncommon::start_data_table_row().   &Apache::loncommon::start_data_table_row().
  '<td align="center" valign="top" >'.$prob.   '<td align="center" valign="top" >'.$prob.
  (scalar(@{$parts}) == 1 ? ''    (scalar(@{$parts}) == 1 ? '' 
                         : '<br />('.&mt('[_1]parts',                          : '<br />('.&mt('[_1]&nbsp;parts)',
  scalar(@{$parts}).'&nbsp;').')'   scalar(@{$parts}))
  ).   ).
  '</td>';   '</td>';
     $studentTable.='<td valign="top">';      $studentTable.='<td valign="top">';
Line 5342  sub displayPage { Line 4512  sub displayPage {
  }   }
     } elsif ($env{'form.lastSub'} eq 'all') {      } elsif ($env{'form.lastSub'} eq 'all') {
  my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');   my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
                 my $identifier = (&canmodify($usec)? $prob : '');  
  $studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,   $studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
  $env{'request.course.id'},   $env{'request.course.id'},
  '','.submission',undef,   '','.submission');
                                                                         $usec,$identifier);  
     
     }      }
     if (&canmodify($usec)) {      if (&canmodify($usec)) {
Line 5370  sub displayPage { Line 4538  sub displayPage {
         '<input type="button" value="'.&mt('Save').'" '.          '<input type="button" value="'.&mt('Save').'" '.
         'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.          'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
         '</form>'."\n";          '</form>'."\n";
       $studentTable.=&show_grading_menu_form($symb);
     $request->print($studentTable);      $request->print($studentTable);
   
     return '';      return '';
Line 5384  sub displaySubByDates { Line 4553  sub displaySubByDates {
  &Apache::loncommon::start_data_table_header_row().   &Apache::loncommon::start_data_table_header_row().
  '<th>'.&mt('Date/Time').'</th>'.   '<th>'.&mt('Date/Time').'</th>'.
  ($isCODE?'<th>'.&mt('CODE').'</th>':'').   ($isCODE?'<th>'.&mt('CODE').'</th>':'').
         ($isTask?'<th>'.&mt('Version').'</th>':'').  
  '<th>'.&mt('Submission').'</th>'.   '<th>'.&mt('Submission').'</th>'.
  '<th>'.&mt('Status').'</th>'.   '<th>'.&mt('Status').'</th>'.
  &Apache::loncommon::end_data_table_header_row();   &Apache::loncommon::end_data_table_header_row();
Line 5398  sub displaySubByDates { Line 4566  sub displaySubByDates {
   
     my $interaction;      my $interaction;
     my $no_increment = 1;      my $no_increment = 1;
     my (%lastrndseed,%lasttype);  
     for ($version=1;$version<=$$record{'version'};$version++) {      for ($version=1;$version<=$$record{'version'};$version++) {
  my $timestamp =    my $timestamp = 
     &Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});      &Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
  if (exists($$record{$version.':resource.0.version'})) {   if (exists($$record{$version.':resource.0.version'})) {
     $interaction = $$record{$version.':resource.0.version'};      $interaction = $$record{$version.':resource.0.version'};
  }   }
         if ($isTask && $env{'form.previousversion'}) {  
             next unless ($interaction == $env{'form.previousversion'});  
         }  
  my $where = ($isTask ? "$version:resource.$interaction"   my $where = ($isTask ? "$version:resource.$interaction"
              : "$version:resource");               : "$version:resource");
  $studentTable.=&Apache::loncommon::start_data_table_row().   $studentTable.=&Apache::loncommon::start_data_table_row().
Line 5415  sub displaySubByDates { Line 4580  sub displaySubByDates {
  if ($isCODE) {   if ($isCODE) {
     $studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';      $studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
  }   }
         if ($isTask) {  
             $studentTable.='<td>'.$interaction.'</td>';  
         }  
  my @versionKeys = split(/\:/,$$record{$version.':keys'});   my @versionKeys = split(/\:/,$$record{$version.':keys'});
  my @displaySub = ();   my @displaySub = ();
  foreach my $partid (@{$parts}) {   foreach my $partid (@{$parts}) {
             my ($hidden,$type);              my $hidden;
             $type = $$record{$version.':resource.'.$partid.'.type'};              if (($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurvey') ||
             if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) {                  ($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurveycred')) {
                 $hidden = 1;                  $hidden = 1;
             }              }
     my @matchKey;      my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
             if ($isTask) {              : sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
                 @matchKey = sort(grep(/^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys));      
             } else {  
  @matchKey = sort(grep(/^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));  
             }  
 #    next if ($$record{"$version:resource.$partid.solved"} eq '');  #    next if ($$record{"$version:resource.$partid.solved"} eq '');
     my $display_part=&get_display_part($partid,$symb);      my $display_part=&get_display_part($partid,$symb);
     foreach my $matchKey (@matchKey) {      foreach my $matchKey (@matchKey) {
Line 5440  sub displaySubByDates { Line 4599  sub displaySubByDates {
                                           
     my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)      my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
                : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));                 : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
                     $displaySub[0].='<span class="LC_nobreak">';                      $displaySub[0].='<span class="LC_nobreak"';
                     $displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'                      $displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
                                    .' <span class="LC_internal_info">'                                     .' <span class="LC_internal_info">'
                                    .'('.&mt('Response ID: [_1]',$responseId).')'                                     .'('.&mt('Part ID: [_1]',$responseId).')'
                                    .'</span>'                                     .'</span>'
                                    .' <b>';                                     .' <b>';
                     if ($hidden) {                      if ($hidden) {
                         $displaySub[0].= &mt('Anonymous Survey').'</b>';                          $displaySub[0].= &mt('Anonymous Survey').'</b>';
                     } else {                      } else {
                         my ($trial,$rndseed,$newvariation);  
                         if ($type eq 'randomizetry') {  
                             $trial = $$record{"$where.$partid.tries"};  
                             $rndseed = $$record{"$where.$partid.rndseed"};  
                         }  
         if ($$record{"$where.$partid.tries"} eq '') {          if ($$record{"$where.$partid.tries"} eq '') {
     $displaySub[0].=&mt('Trial not counted');      $displaySub[0].=&mt('Trial not counted');
         } else {          } else {
     $displaySub[0].=&mt('Trial: [_1]',      $displaySub[0].=&mt('Trial: [_1]',
     $$record{"$where.$partid.tries"});      $$record{"$where.$partid.tries"});
                             if (($rndseed ne '')  && ($lastrndseed{$partid} ne '')) {  
                                 if (($rndseed ne $lastrndseed{$partid}) &&  
                                     (($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) {  
                                     $newvariation = '&nbsp;('.&mt('New variation this try').')';  
                                 }  
                             }  
                             $lastrndseed{$partid} = $rndseed;  
                             $lasttype{$partid} = $type;  
         }          }
         my $responseType=($isTask ? 'Task'          my $responseType=($isTask ? 'Task'
                                               : $responseType->{$partid}->{$responseId});                                                : $responseType->{$partid}->{$responseId});
         if (!exists($orders{$partid})) { $orders{$partid}={}; }          if (!exists($orders{$partid})) { $orders{$partid}={}; }
         if ((!exists($orders{$partid}->{$responseId})) || ($trial)) {          if (!exists($orders{$partid}->{$responseId})) {
     $orders{$partid}->{$responseId}=      $orders{$partid}->{$responseId}=
         &get_order($partid,$responseId,$symb,$uname,$udom,          &get_order($partid,$responseId,$symb,$uname,$udom,
                                            $no_increment,$type,$trial,$rndseed);                                             $no_increment);
         }          }
         $displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak          $displaySub[0].='</b></span>'; # /nobreak
         $displaySub[0].='&nbsp; '.          $displaySub[0].='&nbsp; '.
     &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />';      &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
                     }                      }
  }   }
     }      }
Line 5519  sub displaySubByDates { Line 4665  sub displaySubByDates {
 }  }
   
 sub updateGradeByPage {  sub updateGradeByPage {
     my ($request,$symb) = @_;      my ($request) = shift;
   
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};      my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};      my $cnum      = $env{"course.$env{'request.course.id'}.num"};
Line 5530  sub updateGradeByPage { Line 4676  sub updateGradeByPage {
     my $usec=$classlist->{$env{'form.student'}}[5];      my $usec=$classlist->{$env{'form.student'}}[5];
     if (!&canmodify($usec)) {      if (!&canmodify($usec)) {
  $request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>');   $request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>');
    $request->print(&show_grading_menu_form($env{'form.symb'}));
  return;   return;
     }      }
     my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';      my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
Line 5548  sub updateGradeByPage { Line 4695  sub updateGradeByPage {
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps      my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {      if (!$map) {
  $request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>');   $request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>');
    my ($symb)=&get_symb($request);
    $request->print(&show_grading_menu_form($symb));
  return;    return; 
     }      }
     my $iterator = $navmap->getIterator($map->map_start(),      my $iterator = $navmap->getIterator($map->map_start(),
Line 5564  sub updateGradeByPage { Line 4713  sub updateGradeByPage {
   
     $iterator->next(); # skip the first BEGIN_MAP      $iterator->next(); # skip the first BEGIN_MAP
     my $curRes = $iterator->next(); # for "current resource"      my $curRes = $iterator->next(); # for "current resource"
     my ($depth,$question,$prob,$changeflag,$hideflag)= (1,1,1,0,0);      my ($depth,$question,$prob,$changeflag)= (1,1,1,0);
     while ($depth > 0) {      while ($depth > 0) {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }          if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }          if($curRes == $iterator->END_MAP) { $depth--; }
Line 5577  sub updateGradeByPage { Line 4726  sub updateGradeByPage {
  &Apache::loncommon::start_data_table_row().   &Apache::loncommon::start_data_table_row().
  '<td align="center" valign="top" >'.$prob.   '<td align="center" valign="top" >'.$prob.
  (scalar(@{$parts}) == 1 ? ''    (scalar(@{$parts}) == 1 ? '' 
                                         : '<br />('.&mt('[quant,_1,part]',scalar(@{$parts}))                                          : '<br />('.&mt('[quant,_1,&nbsp;part]',scalar(@{$parts}))
  .')').'</td>';   .')').'</td>';
     $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';      $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
   
Line 5585  sub updateGradeByPage { Line 4734  sub updateGradeByPage {
     my @displayPts=();      my @displayPts=();
             my %aggregate = ();              my %aggregate = ();
             my $aggregateflag = 0;              my $aggregateflag = 0;
             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);  
                 my $numchgs = &makehidden($version,$parts,\%record,$symbx,$udom,$uname,1);  
                 $hideflag += $numchgs;  
             }  
     foreach my $partid (@{$parts}) {      foreach my $partid (@{$parts}) {
  my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};   my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};
  my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};   my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};
Line 5679  sub updateGradeByPage { Line 4822  sub updateGradeByPage {
     }      }
   
     $studentTable.=&Apache::loncommon::end_data_table();      $studentTable.=&Apache::loncommon::end_data_table();
       $studentTable.=&show_grading_menu_form($env{'form.symb'});
     my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :      my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :
   &mt('The scores were changed for [quant,_1,problem].',    &mt('The scores were changed for [quant,_1,problem].',
   $changeflag).'<br />');    $changeflag));
     my $hidemsg=($hideflag == 0 ? '' :      $request->print($grademsg.$studentTable);
                  &mt('Submissions were marked "hidden" for [quant,_1,transaction].',  
                      $hideflag).'<br />');  
     $request->print($hidemsg.$grademsg.$studentTable);  
   
     return '';      return '';
 }  }
Line 5708  sub updateGradeByPage { Line 4849  sub updateGradeByPage {
    from the file that we are parsing that represents one entire sheet     from the file that we are parsing that represents one entire sheet
   
    'bubble line' refers to the data     'bubble line' refers to the data
    representing the line of bubbles that are on the physical bubblesheet     representing the line of bubbles that are on the physical bubble sheet
   
   
 The overall process is that a scanned in bubblesheet data is uploaded  The overall process is that a scanned in bubble sheet data is uploaded
 into a course. When a user wants to grade, they select a  into a course. When a user wants to grade, they select a
 sequence/folder of resources, a file of bubblesheet info, and pick  sequence/folder of resources, a file of bubble sheet info, and pick
 one of the predefined configurations for what each scanline looks  one of the predefined configurations for what each scanline looks
 like.  like.
   
 Next each scanline is checked for any errors of either 'missing  Next each scanline is checked for any errors of either 'missing
 bubbles' (it's an error because it may have been mis-scanned  bubbles' (it's an error because it may have been mis-scanned
 because too light bubbling), 'double bubble' (each bubble line should  because too light bubbling), 'double bubble' (each bubble line should
 have no more than one letter picked), invalid or duplicated CODE,  have no more that one letter picked), invalid or duplicated CODE,
 invalid student/employee ID  invalid student/employee ID
   
 If the CODE option is used that determines the randomization of the  If the CODE option is used that determines the randomization of the
Line 5729  username:domain. Line 4870  username:domain.
   
 During the validation phase the instructor can choose to skip scanlines.   During the validation phase the instructor can choose to skip scanlines. 
   
 After the validation phase, there are now 3 bubblesheet files  After the validation phase, there are now 3 bubble sheet files
   
   scantron_original_filename (unmodified original file)    scantron_original_filename (unmodified original file)
   scantron_corrected_filename (file where the corrected information has replaced the original information)    scantron_corrected_filename (file where the corrected information has replaced the original information)
   scantron_skipped_filename (contains the exact text of scanlines that where skipped)    scantron_skipped_filename (contains the exact text of scanlines that where skipped)
   
 Also there is a separate hash nohist_scantrondata that contains extra  Also there is a separate hash nohist_scantrondata that contains extra
 correction information that isn't representable in the bubblesheet  correction information that isn't representable in the bubble sheet
 file (see &scantron_getfile() for more information)  file (see &scantron_getfile() for more information)
   
 After all scanlines are either valid, marked as valid or skipped, then  After all scanlines are either valid, marked as valid or skipped, then
Line 5759  the homework problem. Line 4900  the homework problem.
   
 sub defaultFormData {  sub defaultFormData {
     my ($symb)=@_;      my ($symb)=@_;
     return '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />';      return '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
        '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
        '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
 }  }
   
   
Line 5808  my %subdivided_bubble_lines;       # no. Line 4951  my %subdivided_bubble_lines;       # no.
   
 my %responsetype_per_response;     # responsetype for each response  my %responsetype_per_response;     # responsetype for each response
   
 my %masterseq_id_responsenum;      # src_id (e.g., 12.3_0.11 etc.) for each  
                                    # numbered response. Needed when randomorder  
                                    # or randompick are in use. Key is ID, value   
                                    # is response number.  
   
 # Save and restore the bubble lines array to the form env.  # Save and restore the bubble lines array to the form env.
   
   
Line 5826  sub save_bubble_lines { Line 4964  sub save_bubble_lines {
         $env{"form.scantron.responsetype.$line"} =          $env{"form.scantron.responsetype.$line"} =
             $responsetype_per_response{$line};              $responsetype_per_response{$line};
     }      }
     foreach my $resid (keys(%masterseq_id_responsenum)) {  
         my $line = $masterseq_id_responsenum{$resid};  
         $env{"form.scantron.residpart.$line"} = $resid;  
     }  
 }  }
   
   
 sub restore_bubble_lines {  sub restore_bubble_lines {
     my $line = 0;      my $line = 0;
     %bubble_lines_per_response = ();      %bubble_lines_per_response = ();
     %masterseq_id_responsenum = ();  
     while ($env{"form.scantron.bubblelines.$line"}) {      while ($env{"form.scantron.bubblelines.$line"}) {
  my $value = $env{"form.scantron.bubblelines.$line"};   my $value = $env{"form.scantron.bubblelines.$line"};
  $bubble_lines_per_response{$line} = $value;   $bubble_lines_per_response{$line} = $value;
Line 5846  sub restore_bubble_lines { Line 4979  sub restore_bubble_lines {
             $env{"form.scantron.sub_bubblelines.$line"};              $env{"form.scantron.sub_bubblelines.$line"};
         $responsetype_per_response{$line} =          $responsetype_per_response{$line} =
             $env{"form.scantron.responsetype.$line"};              $env{"form.scantron.responsetype.$line"};
         my $id = $env{"form.scantron.residpart.$line"};  
         $masterseq_id_responsenum{$id} = $line;  
  $line++;   $line++;
     }      }
 }  }
   
   #  Given the parsed scanline, get the response for 
   #  'answer' number n:
   
   sub get_response_bubbles {
       my ($parsed_line, $response)  = @_;
   
       my $bubble_line = $first_bubble_line{$response-1} +1;
       my $bubble_lines= $bubble_lines_per_response{$response-1};
       
       my $selected = "";
   
       for (my $bline = 0; $bline < $bubble_lines; $bline++) {
    $selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
    $bubble_line++;
       }
       return $selected;
   }
   
 =pod   =pod 
   
 =item scantron_filenames  =item scantron_filenames
Line 5864  sub scantron_filenames { Line 5013  sub scantron_filenames {
     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};      my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};      my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $getpropath = 1;      my $getpropath = 1;
     my ($dirlist,$listerror) = &Apache::lonnet::dirlist('userfiles',$cdom,      my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
                                                         $cname,$getpropath);                                         $getpropath);
     my @possiblenames;      my @possiblenames;
     if (ref($dirlist) eq 'ARRAY') {      foreach my $filename (sort(@files)) {
         foreach my $filename (sort(@{$dirlist})) {   ($filename)=split(/&/,$filename);
     ($filename)=split(/&/,$filename);   if ($filename!~/^scantron_orig_/) { next ; }
     if ($filename!~/^scantron_orig_/) { next ; }   $filename=~s/^scantron_orig_//;
     $filename=~s/^scantron_orig_//;   push(@possiblenames,$filename);
     push(@possiblenames,$filename);  
         }  
     }      }
     return @possiblenames;      return @possiblenames;
 }  }
Line 5912  sub scantron_uploads { Line 5059  sub scantron_uploads {
 sub scantron_scantab {  sub scantron_scantab {
     my $result='<select name="scantron_format">'."\n";      my $result='<select name="scantron_format">'."\n";
     $result.='<option></option>'."\n";      $result.='<option></option>'."\n";
     my @lines = &Apache::lonnet::get_scantronformat_file();      my @lines = &get_scantronformat_file();
     if (@lines > 0) {      if (@lines > 0) {
         foreach my $line (@lines) {          foreach my $line (@lines) {
             next if (($line =~ /^\#/) || ($line eq ''));              next if (($line =~ /^\#/) || ($line eq ''));
Line 5924  sub scantron_scantab { Line 5071  sub scantron_scantab {
     return $result;      return $result;
 }  }
   
   =pod
   
   =item get_scantronformat_file
   
     Returns an array containing lines from the scantron format file for
     the domain of the course.
   
     If a url for a custom.tab file is listed in domain's configuration.db, 
     lines are from this file.
   
     Otherwise, if a default.tab has been published in RES space by the 
     domainconfig user, lines are from this file.
   
     Otherwise, fall back to getting lines from the legacy file on the
     local server:  /home/httpd/lonTabs/default_scantronformat.tab    
   
   =cut
   
   sub get_scantronformat_file {
       my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
       my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$cdom);
       my $gottab = 0;
       my @lines;
       if (ref($domconfig{'scantron'}) eq 'HASH') {
           if ($domconfig{'scantron'}{'scantronformat'} ne '') {
               my $formatfile = &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$domconfig{'scantron'}{'scantronformat'});
               if ($formatfile ne '-1') {
                   @lines = split("\n",$formatfile,-1);
                   $gottab = 1;
               }
           }
       }
       if (!$gottab) {
           my $confname = $cdom.'-domainconfig';
           my $default = $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cdom.'/'.$confname.'/default.tab';
           my $formatfile =  &Apache::lonnet::getfile($default);
           if ($formatfile ne '-1') {
               @lines = split("\n",$formatfile,-1);
               $gottab = 1;
           }
       }
       if (!$gottab) {
           my @domains = &Apache::lonnet::current_machine_domains();
           if (grep(/^\Q$cdom\E$/,@domains)) {
               my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
               @lines = <$fh>;
               close($fh);
           } else {
               my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab');
               @lines = <$fh>;
               close($fh);
           }
       }
       return @lines;
   }
   
 =pod   =pod 
   
 =item scantron_CODElist  =item scantron_CODElist
Line 5971  sub scantron_CODEunique { Line 5174  sub scantron_CODEunique {
   
 =item scantron_selectphase  =item scantron_selectphase
   
   Generates the initial screen to start the bubblesheet process.    Generates the initial screen to start the bubble sheet process.
   Allows for - starting a grading run.    Allows for - starting a grading run.
              - downloading existing scan data (original, corrected               - downloading existing scan data (original, corrected
                                                 or skipped info)                                                  or skipped info)
Line 5985  sub scantron_CODEunique { Line 5188  sub scantron_CODEunique {
 =cut  =cut
   
 sub scantron_selectphase {  sub scantron_selectphase {
     my ($r,$file2grade,$symb) = @_;      my ($r,$file2grade) = @_;
       my ($symb)=&get_symb($r);
     if (!$symb) {return '';}      if (!$symb) {return '';}
     my $map_error;      my $map_error;
     my $sequence_selector=&getSequenceDropDown($symb,\$map_error);      my $sequence_selector=&getSequenceDropDown($symb,\$map_error);
Line 5994  sub scantron_selectphase { Line 5198  sub scantron_selectphase {
         return;          return;
     }      }
     my $default_form_data=&defaultFormData($symb);      my $default_form_data=&defaultFormData($symb);
       my $grading_menu_button=&show_grading_menu_form($symb);
     my $file_selector=&scantron_uploads($file2grade);      my $file_selector=&scantron_uploads($file2grade);
     my $format_selector=&scantron_scantab();      my $format_selector=&scantron_scantab();
     my $CODE_selector=&scantron_CODElist();      my $CODE_selector=&scantron_CODElist();
Line 6002  sub scantron_selectphase { Line 5207  sub scantron_selectphase {
   
     $ssi_error = 0;      $ssi_error = 0;
   
     if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||  
         &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {  
   
         # Chunk of form to prompt for a scantron file upload.  
   
         $r->print('  
     <br />');  
         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('  
     function checkUpload(formname) {  
         if (formname.upfile.value == "") {  
             alert("'.$alertmsg.'");  
             return false;  
         }  
         formname.submit();  
     }'."\n".$formatjs));  
         $r->print('  
               <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">  
                 '.$default_form_data.'  
                 <input name="courseid" type="hidden" value="'.$cnum.'" />  
                 <input name="domainid" type="hidden" value="'.$cdom.'" />  
                 <input name="command" value="scantronupload_save" type="hidden" />  
               '.&Apache::loncommon::start_data_table('LC_scantron_action').'  
               '.&Apache::loncommon::start_data_table_header_row().'  
                 <th>  
                 &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'  
                 </th>  
               '.&Apache::loncommon::end_data_table_header_row().'  
               '.&Apache::loncommon::start_data_table_row().'  
             <td>  
                 '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'<br />'."\n");  
         if ($formatoptions) {  
             $r->print('</td>  
                  '.&Apache::loncommon::end_data_table_row().'  
                  '.&Apache::loncommon::start_data_table_row().'  
                  <td>'.$formattitle.('&nbsp;'x2).$formatoptions.'  
                  </td>  
                  '.&Apache::loncommon::end_data_table_row().'  
                  '.&Apache::loncommon::start_data_table_row().'  
                  <td>'  
             );  
         } else {  
             $r->print(' <br />');  
         }  
         $r->print('<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />  
               </td>  
              '.&Apache::loncommon::end_data_table_row().'  
              '.&Apache::loncommon::end_data_table().'  
              </form>'  
         );  
   
     }  
   
     # Chunk of form to prompt for a file to grade and how:      # Chunk of form to prompt for a file to grade and how:
   
     $result.= '      $result.= '
Line 6106  sub scantron_selectphase { Line 5254  sub scantron_selectphase {
         
     $r->print($result);      $r->print($result);
   
       if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||
           &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
   
    # Chunk of form to prompt for a scantron file upload.
   
           $r->print('
       <br />
       '.&Apache::loncommon::start_data_table('LC_scantron_action').'
          '.&Apache::loncommon::start_data_table_header_row().'
               <th>
                 &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'
               </th>
          '.&Apache::loncommon::end_data_table_header_row().'
          '.&Apache::loncommon::start_data_table_row().'
               <td>
   ');
       my $default_form_data=&defaultFormData(&get_symb($r,1));
       my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
       my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
       $r->print(&Apache::lonhtmlcommon::scripttag('
       function checkUpload(formname) {
    if (formname.upfile.value == "") {
       alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
       return false;
    }
    formname.submit();
       }'));
       $r->print('
                 <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
                   '.$default_form_data.'
                   <input name="courseid" type="hidden" value="'.$cnum.'" />
                   <input name="domainid" type="hidden" value="'.$cdom.'" />
                   <input name="command" value="scantronupload_save" type="hidden" />
                   '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
                   <br />
                   <input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
                 </form>
   ');
   
           $r->print('
               </td>
          '.&Apache::loncommon::end_data_table_row().'
          '.&Apache::loncommon::end_data_table().'
   ');
       }
   
     # Chunk of the form that prompts to view a scoring office file,      # Chunk of the form that prompts to view a scoring office file,
     # corrected file, skipped records in a file.      # corrected file, skipped records in a file.
   
Line 6132  sub scantron_selectphase { Line 5326  sub scantron_selectphase {
   
     &Apache::lonpickcode::code_list($r,2);      &Apache::lonpickcode::code_list($r,2);
   
     $r->print('<br /><form method="post" name="checkscantron" action="">'.      $r->print('<br /><form method="post" name="checkscantron">'.
              $default_form_data."\n".               $default_form_data."\n".
              &Apache::loncommon::start_data_table('LC_scantron_action')."\n".               &Apache::loncommon::start_data_table('LC_scantron_action')."\n".
              &Apache::loncommon::start_data_table_header_row()."\n".               &Apache::loncommon::start_data_table_header_row()."\n".
Line 6164  sub scantron_selectphase { Line 5358  sub scantron_selectphase {
               &Apache::loncommon::end_data_table_row()."\n".                &Apache::loncommon::end_data_table_row()."\n".
               &Apache::loncommon::end_data_table()."\n".                &Apache::loncommon::end_data_table()."\n".
               '</form><br />');                '</form><br />');
       $r->print($grading_menu_button);
     return;      return;
 }  }
   
   =pod
   
   =item get_scantron_config
   
      Parse and return the scantron configuration line selected as a
      hash of configuration file fields.
   
    Arguments:
       which - the name of the configuration to parse from the file.
   
   
    Returns:
               If the named configuration is not in the file, an empty
               hash is returned.
       a hash with the fields
         name         - internal name for the this configuration setup
         description  - text to display to operator that describes this config
         CODElocation - if 0 or the string 'none'
                             - no CODE exists for this config
                        if -1 || the string 'letter'
                             - a CODE exists for this config and is
                               a string of letters
                        Unsupported value (but planned for future support)
                             if a positive integer
                                  - The CODE exists as the first n items from
                                    the question section of the form
                             if the string 'number'
                                  - The CODE exists for this config and is
                                    a string of numbers
         CODEstart   - (only matter if a CODE exists) column in the line where
                        the CODE starts
         CODElength  - length of the CODE
         IDstart     - column where the student/employee ID starts
         IDlength    - length of the student/employee ID info
         Qstart      - column where the information from the bubbled
                       'questions' start
         Qlength     - number of columns comprising a single bubble line from
                       the sheet. (usually either 1 or 10)
         Qon         - either a single character representing the character used
                       to signal a bubble was chosen in the positional setup, or
                       the string 'letter' if the letter of the chosen bubble is
                       in the final, or 'number' if a number representing the
                       chosen bubble is in the file (1->A 0->J)
         Qoff        - the character used to represent that a bubble was
                       left blank
         PaperID     - if the scanning process generates a unique number for each
                       sheet scanned the column that this ID number starts in
         PaperIDlength - number of columns that comprise the unique ID number
                         for the sheet of paper
         FirstName   - column that the first name starts in
         FirstNameLength - number of columns that the first name spans
    
         LastName    - column that the last name starts in
         LastNameLength - number of columns that the last name spans
   
   =cut
   
   sub get_scantron_config {
       my ($which) = @_;
       my @lines = &get_scantronformat_file();
       my %config;
       #FIXME probably should move to XML it has already gotten a bit much now
       foreach my $line (@lines) {
    my ($name,$descrip)=split(/:/,$line);
    if ($name ne $which ) { next; }
    chomp($line);
    my @config=split(/:/,$line);
    $config{'name'}=$config[0];
    $config{'description'}=$config[1];
    $config{'CODElocation'}=$config[2];
    $config{'CODEstart'}=$config[3];
    $config{'CODElength'}=$config[4];
    $config{'IDstart'}=$config[5];
    $config{'IDlength'}=$config[6];
    $config{'Qstart'}=$config[7];
     $config{'Qlength'}=$config[8];
    $config{'Qoff'}=$config[9];
    $config{'Qon'}=$config[10];
    $config{'PaperID'}=$config[11];
    $config{'PaperIDlength'}=$config[12];
    $config{'FirstName'}=$config[13];
    $config{'FirstNamelength'}=$config[14];
    $config{'LastName'}=$config[15];
    $config{'LastNamelength'}=$config[16];
    last;
       }
       return %config;
   }
   
 =pod   =pod 
   
 =item username_to_idmap  =item username_to_idmap
Line 6190  sub username_to_idmap { Line 5474  sub username_to_idmap {
     my ($classlist)= @_;      my ($classlist)= @_;
     my %idmap;      my %idmap;
     foreach my $student (keys(%$classlist)) {      foreach my $student (keys(%$classlist)) {
         my $id = $classlist->{$student}->[&Apache::loncoursedata::CL_ID];   $idmap{$classlist->{$student}->[&Apache::loncoursedata::CL_ID]}=
         unless ($id eq '') {      $student;
             if (!exists($idmap{$id})) {  
                 $idmap{$id} = $student;  
             } else {  
                 my $status = $classlist->{$student}->[&Apache::loncoursedata::CL_STATUS];  
                 if ($status eq 'Active') {  
                     $idmap{$id} = $student;  
                 }  
             }  
         }  
     }      }
     return %idmap;      return %idmap;
 }  }
Line 6212  sub username_to_idmap { Line 5487  sub username_to_idmap {
    Process a requested correction to a scanline.     Process a requested correction to a scanline.
   
   Arguments:    Arguments:
     $scantron_config   - hash from &Apache::lonnet::get_scantron_config()      $scantron_config   - hash from &get_scantron_config()
     $scan_data         - hash of correction information       $scan_data         - hash of correction information 
                           (see &scantron_getfile())                            (see &scantron_getfile())
     $line              - existing scanline      $line              - existing scanline
Line 6382  sub digits_to_letters { Line 5657  sub digits_to_letters {
                        (see scantron_getfile for more information)                         (see scantron_getfile for more information)
     just_header      - True if should not process question answers but only      just_header      - True if should not process question answers but only
                        the stuff to the left of the answers.                         the stuff to the left of the answers.
     randomorder      - True if randomorder in use  
     randompick       - True if randompick in use  
     sequence         - Exam folder URL  
     master_seq       - Ref to array containing symbs in exam folder  
     symb_to_resource - Ref to hash of symbs for resources in exam folder  
                        (corresponding values are resource objects)  
     partids_by_symb  - Ref to hash of symb -> array ref of partIDs  
     orderedforcode   - Ref to hash of arrays. keys are CODEs and values  
                        are refs to an array of resource objects, ordered  
                        according to order used for CODE, when randomorder  
                        and or randompick are in use.  
     respnumlookup    - Ref to hash mapping question numbers in bubble lines  
                        for current line to question number used for same question  
                         in "Master Sequence" (as seen by Course Coordinator).  
     startline        - Ref to hash where key is question number (0 is first)  
                        and value is number of first bubble line for current   
                        student or code-based randompick and/or randomorder.  
     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:   Returns:
    Hash containing the result of parsing the scanline     Hash containing the result of parsing the scanline
   
Line 6447  sub digits_to_letters { Line 5701  sub digits_to_letters {
 =cut  =cut
   
 sub scantron_parse_scanline {  sub scantron_parse_scanline {
     my ($line,$whichline,$scantron_config,$scan_data,$just_header,$idmap,      my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_;
         $randomorder,$randompick,$sequence,$master_seq,$symb_to_resource,  
         $partids_by_symb,$orderedforcode,$respnumlookup,$startline,$totalref)=@_;  
   
     my %record;      my %record;
     my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # stuff before answers      my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'};
       my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos);  # Answers
       my $data=substr($line,0,$$scantron_config{'Qstart'}-1);     # earlier stuff
     if (!($$scantron_config{'CODElocation'} eq 0 ||      if (!($$scantron_config{'CODElocation'} eq 0 ||
   $$scantron_config{'CODElocation'} eq 'none')) {    $$scantron_config{'CODElocation'} eq 'none')) {
  if ($$scantron_config{'CODElocation'} < 0 ||   if ($$scantron_config{'CODElocation'} < 0 ||
Line 6488  sub scantron_parse_scanline { Line 5742  sub scantron_parse_scanline {
     my $questnum=0;      my $questnum=0;
     my $ansnum  =1; # Multiple 'answer lines'/question.      my $ansnum  =1; # Multiple 'answer lines'/question.
   
     my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'};  
     if ($randompick || $randomorder) {  
         my $total = &get_respnum_lookups($sequence,$scan_data,$idmap,$line,\%record,  
                                          $master_seq,$symb_to_resource,  
                                          $partids_by_symb,$orderedforcode,  
                                          $respnumlookup,$startline);  
         if ($total) {  
             $lastpos = $total*$$scantron_config{'Qlength'};  
         }  
         if (ref($totalref)) {  
             $$totalref = $total;  
         }  
     }  
     my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos);  # Answers  
     chomp($questions); # Get rid of any trailing \n.      chomp($questions); # Get rid of any trailing \n.
     $questions =~ s/\r$//;      # Get rid of trailing \r too (MAC or Win uploads).      $questions =~ s/\r$//;      # Get rid of trailing \r too (MAC or Win uploads).
     while (length($questions)) {      while (length($questions)) {
         my $answers_needed;   my $answers_needed = $bubble_lines_per_response{$questnum};
         if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {  
             $answers_needed = $bubble_lines_per_response{$respnumlookup->{$questnum}};  
         } else {  
             $answers_needed = $bubble_lines_per_response{$questnum};  
         }  
         my $answer_length  = ($$scantron_config{'Qlength'} * $answers_needed)          my $answer_length  = ($$scantron_config{'Qlength'} * $answers_needed)
                              || 1;                               || 1;
         $questnum++;          $questnum++;
Line 6519  sub scantron_parse_scanline { Line 5754  sub scantron_parse_scanline {
         $questions       = substr($questions,$answer_length);          $questions       = substr($questions,$answer_length);
         if (length($currentquest) < $answer_length) { next; }          if (length($currentquest) < $answer_length) { next; }
   
         my $subdivided;          if ($subdivided_bubble_lines{$questnum-1} =~ /,/) {
         if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {  
             $subdivided = $subdivided_bubble_lines{$respnumlookup->{$questnum-1}};  
         } else {  
             $subdivided = $subdivided_bubble_lines{$questnum-1};  
         }  
         if ($subdivided =~ /,/) {  
             my $subquestnum = 1;              my $subquestnum = 1;
             my $subquestions = $currentquest;              my $subquestions = $currentquest;
             my @subanswers_needed = split(/,/,$subdivided);              my @subanswers_needed = 
                   split(/,/,$subdivided_bubble_lines{$questnum-1});  
             foreach my $subans (@subanswers_needed) {              foreach my $subans (@subanswers_needed) {
                 my $subans_length =                  my $subans_length =
                     ($$scantron_config{'Qlength'} * $subans)  || 1;                      ($$scantron_config{'Qlength'} * $subans)  || 1;
Line 6539  sub scantron_parse_scanline { Line 5769  sub scantron_parse_scanline {
                     ($$scantron_config{'Qon'} eq 'number')) {                      ($$scantron_config{'Qon'} eq 'number')) {
                     $ansnum = &scantron_validator_lettnum($ansnum,                       $ansnum = &scantron_validator_lettnum($ansnum, 
                         $questnum,$quest_id,$subans,$currsubquest,$whichline,                          $questnum,$quest_id,$subans,$currsubquest,$whichline,
                         \@alphabet,\%record,$scantron_config,$scan_data,                          \@alphabet,\%record,$scantron_config,$scan_data);
                         $randomorder,$randompick,$respnumlookup);  
                 } else {                  } else {
                     $ansnum = &scantron_validator_positional($ansnum,                      $ansnum = &scantron_validator_positional($ansnum,
                         $questnum,$quest_id,$subans,$currsubquest,$whichline,                          $questnum,$quest_id,$subans,$currsubquest,$whichline,                        \@alphabet,\%record,$scantron_config,$scan_data);
                         \@alphabet,\%record,$scantron_config,$scan_data,  
                         $randomorder,$randompick,$respnumlookup);  
                 }                  }
                 $subquestnum ++;                  $subquestnum ++;
             }              }
Line 6554  sub scantron_parse_scanline { Line 5781  sub scantron_parse_scanline {
                 ($$scantron_config{'Qon'} eq 'number')) {                  ($$scantron_config{'Qon'} eq 'number')) {
                 $ansnum = &scantron_validator_lettnum($ansnum,$questnum,                  $ansnum = &scantron_validator_lettnum($ansnum,$questnum,
                     $quest_id,$answers_needed,$currentquest,$whichline,                      $quest_id,$answers_needed,$currentquest,$whichline,
                     \@alphabet,\%record,$scantron_config,$scan_data,                      \@alphabet,\%record,$scantron_config,$scan_data);
                     $randomorder,$randompick,$respnumlookup);  
             } else {              } else {
                 $ansnum = &scantron_validator_positional($ansnum,$questnum,                  $ansnum = &scantron_validator_positional($ansnum,$questnum,
                     $quest_id,$answers_needed,$currentquest,$whichline,                      $quest_id,$answers_needed,$currentquest,$whichline,
                     \@alphabet,\%record,$scantron_config,$scan_data,                      \@alphabet,\%record,$scantron_config,$scan_data);
                     $randomorder,$randompick,$respnumlookup);  
             }              }
         }          }
     }      }
Line 6568  sub scantron_parse_scanline { Line 5793  sub scantron_parse_scanline {
     return \%record;      return \%record;
 }  }
   
 sub get_master_seq {  
     my ($resources,$master_seq,$symb_to_resource) = @_;  
     return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') &&  
                    (ref($symb_to_resource) eq 'HASH'));  
     my $resource_error;  
     foreach my $resource (@{$resources}) {  
         my $ressymb;  
         if (ref($resource)) {  
             $ressymb = $resource->symb();  
             push(@{$master_seq},$ressymb);  
             $symb_to_resource->{$ressymb} = $resource;  
         } else {  
             $resource_error = 1;  
             last;  
         }  
     }  
     return $resource_error;  
 }  
   
 sub get_respnum_lookups {  
     my ($sequence,$scan_data,$idmap,$line,$record,$master_seq,$symb_to_resource,  
         $partids_by_symb,$orderedforcode,$respnumlookup,$startline) = @_;  
     return unless ((ref($record) eq 'HASH') && (ref($master_seq) eq 'ARRAY') &&  
                    (ref($symb_to_resource) eq 'HASH') && (ref($partids_by_symb) eq 'HASH') &&  
                    (ref($orderedforcode) eq 'HASH') && (ref($respnumlookup) eq 'HASH') &&  
                    (ref($startline) eq 'HASH'));  
     my ($user,$scancode);  
     if ((exists($record->{'scantron.CODE'})) &&  
         (&Apache::lonnet::validCODE($record->{'scantron.CODE'}))) {  
         $scancode = $record->{'scantron.CODE'};  
     } else {  
         $user = &scantron_find_student($record,$scan_data,$idmap,$line);  
     }  
     my @mapresources =  
         &users_order($user,$scancode,$sequence,$master_seq,$symb_to_resource,  
                      $orderedforcode);  
     my $total = 0;  
     my $count = 0;  
     foreach my $resource (@mapresources) {  
         my $id = $resource->id();  
         my $symb = $resource->symb();  
         if (ref($partids_by_symb->{$symb}) eq 'ARRAY') {  
             foreach my $partid (@{$partids_by_symb->{$symb}}) {  
                 my $respnum = $masterseq_id_responsenum{$id.'_'.$partid};  
                 if ($respnum ne '') {  
                     $respnumlookup->{$count} = $respnum;  
                     $startline->{$count} = $total;  
                     $total += $bubble_lines_per_response{$respnum};  
                     $count ++;  
                 }  
             }  
         }  
     }  
     return $total;  
 }  
   
 sub scantron_validator_lettnum {  sub scantron_validator_lettnum {
     my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline,      my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline,
         $alphabet,$record,$scantron_config,$scan_data,$randomorder,          $alphabet,$record,$scantron_config,$scan_data) = @_;
         $randompick,$respnumlookup) = @_;  
   
     # Qon 'letter' implies for each slot in currquest we have:      # Qon 'letter' implies for each slot in currquest we have:
     #    ? or * for doubles, a letter in A-Z for a bubble, and      #    ? or * for doubles, a letter in A-Z for a bubble, and
Line 6646  sub scantron_validator_lettnum { Line 5814  sub scantron_validator_lettnum {
         $matchon = '\d';          $matchon = '\d';
     }      }
     my $occurrences = 0;      my $occurrences = 0;
     my $responsenum = $questnum-1;      if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
     if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {          ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
        $responsenum = $respnumlookup->{$questnum-1}          ($responsetype_per_response{$questnum-1} eq 'stringresponse') ||
     }          ($responsetype_per_response{$questnum-1} eq 'imageresponse') ||
     if (($responsetype_per_response{$responsenum} eq 'essayresponse') ||          ($responsetype_per_response{$questnum-1} eq 'reactionresponse') ||
         ($responsetype_per_response{$responsenum} eq 'formularesponse') ||          ($responsetype_per_response{$questnum-1} eq 'organicresponse')) {
         ($responsetype_per_response{$responsenum} eq 'stringresponse') ||  
         ($responsetype_per_response{$responsenum} eq 'imageresponse') ||  
         ($responsetype_per_response{$responsenum} eq 'reactionresponse') ||  
         ($responsetype_per_response{$responsenum} eq 'organicresponse')) {  
         my @singlelines = split('',$currquest);          my @singlelines = split('',$currquest);
         foreach my $entry (@singlelines) {          foreach my $entry (@singlelines) {
             $occurrences = &occurence_count($entry,$matchon);              $occurrences = &occurence_count($entry,$matchon);
             if ($occurrences > 1) {              if ($occurrences > 1) {
                 last;                  last;
             }              }
         }          } 
     } else {      } else {
         $occurrences = &occurence_count($currquest,$matchon);           $occurrences = &occurence_count($currquest,$matchon); 
     }      }
Line 6710  sub scantron_validator_lettnum { Line 5874  sub scantron_validator_lettnum {
   
 sub scantron_validator_positional {  sub scantron_validator_positional {
     my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,      my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,
         $whichline,$alphabet,$record,$scantron_config,$scan_data,          $whichline,$alphabet,$record,$scantron_config,$scan_data) = @_;
         $randomorder,$randompick,$respnumlookup) = @_;  
   
     # Otherwise there's a positional notation;      # Otherwise there's a positional notation;
     # each bubble line requires Qlength items, and there are filled in      # each bubble line requires Qlength items, and there are filled in
Line 6753  sub scantron_validator_positional { Line 5916  sub scantron_validator_positional {
         #  record all the bubbles filled in as well as the          #  record all the bubbles filled in as well as the
         #  fact this response consists of multiple bubbles.          #  fact this response consists of multiple bubbles.
         #          #
         my $responsenum = $questnum-1;          if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
         if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {              ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
             $responsenum = $respnumlookup->{$questnum-1}              ($responsetype_per_response{$questnum-1} eq 'stringresponse') ||
         }              ($responsetype_per_response{$questnum-1} eq 'imageresponse') ||
         if (($responsetype_per_response{$responsenum} eq 'essayresponse') ||              ($responsetype_per_response{$questnum-1} eq 'reactionresponse') ||
             ($responsetype_per_response{$responsenum} eq 'formularesponse') ||              ($responsetype_per_response{$questnum-1} eq 'organicresponse')) {
             ($responsetype_per_response{$responsenum} eq 'stringresponse') ||  
             ($responsetype_per_response{$responsenum} eq 'imageresponse') ||  
             ($responsetype_per_response{$responsenum} eq 'reactionresponse') ||  
             ($responsetype_per_response{$responsenum} eq 'organicresponse')) {  
             my $doubleerror = 0;              my $doubleerror = 0;
             while (($currquest >= $$scantron_config{'Qlength'}) &&               while (($currquest >= $$scantron_config{'Qlength'}) && 
                    (!$doubleerror)) {                     (!$doubleerror)) {
Line 6895  sub scantron_filter { Line 6054  sub scantron_filter {
   
 sub scantron_process_corrections {  sub scantron_process_corrections {
     my ($r) = @_;      my ($r) = @_;
     my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();      my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();      my $classlist=&Apache::loncoursedata::get_classlist();
     my $which=$env{'form.scantron_line'};      my $which=$env{'form.scantron_line'};
Line 6944  sub scantron_process_corrections { Line 6103  sub scantron_process_corrections {
  }   }
     }      }
     if ($err) {      if ($err) {
  $r->print(   $r->print("<span class=\"LC_warning\">Unable to accept last correction, an error occurred :$errmsg:</span>");
             '<p class="LC_error">'  
            .&mt('Unable to accept last correction, an error occurred: [_1]',  
                 $errmsg)  
            .'</p>');  
     } else {      } else {
  &scantron_put_line($scanlines,$scan_data,$which,$line,$skip);   &scantron_put_line($scanlines,$scan_data,$which,$line,$skip);
  &scantron_putfile($scanlines,$scan_data);   &scantron_putfile($scanlines,$scan_data);
Line 7040  sub remember_current_skipped { Line 6195  sub remember_current_skipped {
 =item check_for_error  =item check_for_error
   
     Checks if there was an error when attempting to remove a specific      Checks if there was an error when attempting to remove a specific
     scantron_.. bubblesheet data file. Prints out an error if      scantron_.. bubble sheet data file. Prints out an error if
     something went wrong.      something went wrong.
   
 =cut  =cut
Line 7062  sub check_for_error { Line 6217  sub check_for_error {
 =cut  =cut
   
 sub scantron_warning_screen {  sub scantron_warning_screen {
     my ($button_text,$symb)=@_;      my ($button_text)=@_;
     my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});      my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
     my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my $CODElist;      my $CODElist;
     if ($scantron_config{'CODElocation'} &&      if ($scantron_config{'CODElocation'} &&
  $scantron_config{'CODEstart'} &&   $scantron_config{'CODEstart'} &&
  $scantron_config{'CODElength'}) {   $scantron_config{'CODElength'}) {
  $CODElist=$env{'form.scantron_CODElist'};   $CODElist=$env{'form.scantron_CODElist'};
  if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">'.&mt('None').'</span>'; }   if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }
  $CODElist=   $CODElist=
     '<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.      '<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.
     $env{'form.scantron_CODElist'}.'</tt></td></tr>';      $env{'form.scantron_CODElist'}.'</tt></td></tr>';
     }      }
     my $lastbubblepoints;  
     if ($env{'form.scantron_lastbubblepoints'} ne '') {  
         $lastbubblepoints =  
             '<tr><td><b>'.&mt('Hand-graded items: points from last bubble in row').'</b></td><td><tt>'.  
             $env{'form.scantron_lastbubblepoints'}.'</tt></td></tr>';  
     }  
     return ('      return ('
 <p>  <p>
 <span class="LC_warning">  <span class="LC_warning">
 '.&mt("Please double check the information below before clicking on '[_1]'",&mt($button_text)).'</span>  '.&mt('Please double check the information below before clicking on \'[_1]\'',&mt($button_text)).'</span>
 </p>  </p>
 <table>  <table>
 <tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr>  <tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr>
 <tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr>  <tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr>
 '.$CODElist.$lastbubblepoints.'  '.$CODElist.'
 </table>  </table>
 <p> '.&mt("If this information is correct, please click on '[_1]'.",&mt($button_text)).'<br />  <br />
 '.&mt('If something is incorrect, please return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>  <p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p>
   <p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p>
   
 <br />  <br />
 ');  ');
Line 7108  sub scantron_warning_screen { Line 6258  sub scantron_warning_screen {
 =cut  =cut
   
 sub scantron_do_warning {  sub scantron_do_warning {
     my ($r,$symb)=@_;      my ($r)=@_;
       my ($symb)=&get_symb($r);
     if (!$symb) {return '';}      if (!$symb) {return '';}
     my $default_form_data=&defaultFormData($symb);      my $default_form_data=&defaultFormData($symb);
     $r->print(&scantron_form_start().$default_form_data);      $r->print(&scantron_form_start().$default_form_data);
     if ( $env{'form.selectpage'} eq '' ||      if ( $env{'form.selectpage'} eq '' ||
  $env{'form.scantron_selectfile'} eq '' ||   $env{'form.scantron_selectfile'} eq '' ||
  $env{'form.scantron_format'} eq '' ) {   $env{'form.scantron_format'} eq '' ) {
  $r->print("<p>".&mt('You have forgotten to specify some information. Please go Back and try again.')."</p>");   $r->print("<p>".&mt('You have forgetten to specify some information. Please go Back and try again.')."</p>");
  if ( $env{'form.selectpage'} eq '') {   if ( $env{'form.selectpage'} eq '') {
     $r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>');      $r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>');
  }    } 
  if ( $env{'form.scantron_selectfile'} eq '') {   if ( $env{'form.scantron_selectfile'} eq '') {
     $r->print('<p><span class="LC_error">'.&mt("You have not selected a file that contains the student's response data.").'</span></p>');      $r->print('<p><span class="LC_error">'.&mt('You have not selected a file that contains the student\'s response data.').'</span></p>');
  }    } 
  if ( $env{'form.scantron_format'} eq '') {   if ( $env{'form.scantron_format'} eq '') {
     $r->print('<p><span class="LC_error">'.&mt("You have not selected the format of the student's response data.").'</span></p>');      $r->print('<p><span class="LC_error">'.&mt('You have not selected a the format of the student\'s response data.').'</span></p>');
  }    } 
     } else {      } else {
  my $warning=&scantron_warning_screen('Grading: Validate Records',$symb);   my $warning=&scantron_warning_screen('Grading: Validate Records');
         my $bubbledbyhand=&hand_bubble_option();  
  $r->print('   $r->print('
 '.$warning.$bubbledbyhand.'  '.$warning.'
 <input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />  <input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />
 <input type="hidden" name="command" value="scantron_validate" />  <input type="hidden" name="command" value="scantron_validate" />
 ');  ');
     }      }
     $r->print("</form><br />");      $r->print("</form><br />".&show_grading_menu_form($symb));
     return '';      return '';
 }  }
   
Line 7171  SCANTRONFORM Line 6321  SCANTRONFORM
            '<input type="hidden" name="scantron.sub_bubblelines.'.$line.'" value="'.$env{"form.scantron.sub_bubblelines.$line"}.'" />'."\n";             '<input type="hidden" name="scantron.sub_bubblelines.'.$line.'" value="'.$env{"form.scantron.sub_bubblelines.$line"}.'" />'."\n";
        $chunk .=         $chunk .=
            '<input type="hidden" name="scantron.responsetype.'.$line.'" value="'.$env{"form.scantron.responsetype.$line"}.'" />'."\n";             '<input type="hidden" name="scantron.responsetype.'.$line.'" value="'.$env{"form.scantron.responsetype.$line"}.'" />'."\n";
        $chunk .=  
            '<input type="hidden" name="scantron.residpart.'.$line.'" value="'.$env{"form.scantron.residpart.$line"}.'" />'."\n";  
        $result .= $chunk;         $result .= $chunk;
        $line++;         $line++;
     }     }
     return $result;      return $result;
 }  }
   
Line 7183  SCANTRONFORM Line 6331  SCANTRONFORM
   
 =item scantron_validate_file  =item scantron_validate_file
   
     Dispatch routine for doing validation of a bubblesheet data file.      Dispatch routine for doing validation of a bubble sheet data file.
   
     Also processes any necessary information resets that need to      Also processes any necessary information resets that need to
     occur before validation begins (ignore previous corrections,      occur before validation begins (ignore previous corrections,
Line 7192  SCANTRONFORM Line 6340  SCANTRONFORM
 =cut  =cut
   
 sub scantron_validate_file {  sub scantron_validate_file {
     my ($r,$symb) = @_;      my ($r) = @_;
       my ($symb)=&get_symb($r);
     if (!$symb) {return '';}      if (!$symb) {return '';}
     my $default_form_data=&defaultFormData($symb);      my $default_form_data=&defaultFormData($symb);
           
     # do the detection of only doing skipped records first before we delete      # do the detection of only doing skipped records first befroe we delete
     # them when doing the corrections reset      # them when doing the corrections reset
     if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') {      if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') {
  &reset_skipping_status();   &reset_skipping_status();
Line 7220  sub scantron_validate_file { Line 6369  sub scantron_validate_file {
     #get the student pick code ready      #get the student pick code ready
     $r->print(&Apache::loncommon::studentbrowser_javascript());      $r->print(&Apache::loncommon::studentbrowser_javascript());
     my $nav_error;      my $nav_error;
     my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});      my $max_bubble=&scantron_get_maxbubble(\$nav_error);
     my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);  
     if ($nav_error) {      if ($nav_error) {
         $r->print(&navmap_errormsg());          $r->print(&navmap_errormsg());
         return '';          return '';
     }      }
     my $result=&scantron_form_start($max_bubble).$default_form_data;      my $result=&scantron_form_start($max_bubble).$default_form_data;
     if ($env{'form.scantron_lastbubblepoints'} ne '') {  
         $result .= '<input type="hidden" name="scantron_lastbubblepoints" value="'.$env{'form.scantron_lastbubblepoints'}.'" />';  
     }  
     $r->print($result);      $r->print($result);
           
     my @validate_phases=( 'sequence',      my @validate_phases=( 'sequence',
Line 7247  sub scantron_validate_file { Line 6392  sub scantron_validate_file {
     while (!$stop && $currentphase < scalar(@validate_phases)) {      while (!$stop && $currentphase < scalar(@validate_phases)) {
  $r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />');   $r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />');
  $r->rflush();   $r->rflush();
   
  my $which="scantron_validate_".$validate_phases[$currentphase];   my $which="scantron_validate_".$validate_phases[$currentphase];
  {   {
     no strict 'refs';      no strict 'refs';
Line 7255  sub scantron_validate_file { Line 6399  sub scantron_validate_file {
  }   }
     }      }
     if (!$stop) {      if (!$stop) {
  my $warning=&scantron_warning_screen('Start Grading',$symb);   my $warning=&scantron_warning_screen('Start Grading');
  $r->print(&mt('Validation process complete.').'<br />'.   $r->print(&mt('Validation process complete.').'<br />'.
                   $warning.                    $warning.
                   &mt('Perform verification for each student after storage of submissions?').                    &mt('Perform verification for each student after storage of submissions?').
Line 7265  sub scantron_validate_file { Line 6409  sub scantron_validate_file {
                   '<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No').                    '<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No').
                   '</label></span><br />'.                    '</label></span><br />'.
                   &mt('Grading will take longer if you use verification.').'<br />'.                    &mt('Grading will take longer if you use verification.').'<br />'.
                   &mt('Otherwise, Grade/Manage/Review Bubblesheets [_1] Review bubblesheet data can be used once grading is complete.','&raquo;').'<br /><br />'.                    &mt("Alternatively, the 'Review bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'.
                   '<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'.                    '<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'.
                   '<input type="hidden" name="command" value="scantron_process" />'."\n");                    '<input type="hidden" name="command" value="scantron_process" />'."\n");
     } else {      } else {
Line 7277  sub scantron_validate_file { Line 6421  sub scantron_validate_file {
     $r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' &rarr; " />');      $r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' &rarr; " />');
     $r->print(' '.&mt('this error').' <br />');      $r->print(' '.&mt('this error').' <br />');
   
             $r->print('<p>'.&mt('Or return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>');      $r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");
  } else {   } else {
             if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') {              if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') {
         $r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' &rarr;" onclick="javascript:verify_bubble_radio(this.form)" />');          $r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' &rarr;" onclick="javascript:verify_bubble_radio(this.form)" />');
Line 7289  sub scantron_validate_file { Line 6433  sub scantron_validate_file {
     $r->print(" ".&mt("this scanline saving it for later."));      $r->print(" ".&mt("this scanline saving it for later."));
  }   }
     }      }
     $r->print(" </form><br />");      $r->print(" </form><br />".&show_grading_menu_form($symb));
     return '';      return '';
 }  }
   
Line 7298  sub scantron_validate_file { Line 6442  sub scantron_validate_file {
   
 =item scantron_remove_file  =item scantron_remove_file
   
    Removes the requested bubblesheet data file, makes sure that     Removes the requested bubble sheet data file, makes sure that
    scantron_original_<filename> is never removed     scantron_original_<filename> is never removed
   
   
Line 7323  sub scantron_remove_file { Line 6467  sub scantron_remove_file {
   
 =item scantron_remove_scan_data  =item scantron_remove_scan_data
   
    Removes all scan_data correction for the requested bubblesheet     Removes all scan_data correction for the requested bubble sheet
    data file.  (In the case that both the are doing skipped records we need     data file.  (In the case that both the are doing skipped records we need
    to remember the old skipped lines for the time being so that element     to remember the old skipped lines for the time being so that element
    persists for a while.)     persists for a while.)
Line 7360  sub scantron_remove_scan_data { Line 6504  sub scantron_remove_scan_data {
   
 =item scantron_getfile  =item scantron_getfile
   
     Fetches the requested bubblesheet data file (all 3 versions), and      Fetches the requested bubble sheet data file (all 3 versions), and
     the scan_data hash      the scan_data hash
       
   Arguments:    Arguments:
Line 7460  sub lonnet_putfile { Line 6604  sub lonnet_putfile {
   
 =item scantron_putfile  =item scantron_putfile
   
     Stores the current version of the bubblesheet data files, and the      Stores the current version of the bubble sheet data files, and the
     scan_data hash. (Does not modify the original version only the      scan_data hash. (Does not modify the original version only the
     corrected and skipped versions.      corrected and skipped versions.
   
Line 7554  sub get_todo_count { Line 6698  sub get_todo_count {
   
 =item scantron_put_line  =item scantron_put_line
   
     Updates the 'corrected' or 'skipped' versions of the bubblesheet      Updates the 'corrected' or 'skipped' versions of the bubble sheet
     data file.      data file.
   
  Arguments:   Arguments:
Line 7656  sub scantron_validate_sequence { Line 6800  sub scantron_validate_sequence {
  my @resources=   my @resources=
     $navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);      $navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);
  if (@resources) {   if (@resources) {
     $r->print('<p class="LC_warning">'      $r->print("<p>".&mt('Some resources in the sequence currently are not set to exam mode. Grading these resources currently may not work correctly.')."</p>");
                .&mt('Some resources in the sequence currently are not set to'  
                    .' exam mode. Grading these resources currently may not'  
                    .' work correctly.')  
                .'</p>'  
             );  
     return (1,$currentphase);      return (1,$currentphase);
  }   }
     }      }
Line 7679  sub scantron_validate_ID { Line 6818  sub scantron_validate_ID {
     my %idmap=&username_to_idmap($classlist);      my %idmap=&username_to_idmap($classlist);
   
     #get scantron line setup      #get scantron line setup
     my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();      my ($scanlines,$scan_data)=&scantron_getfile();
   
     my $nav_error;      my $nav_error;
     &scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble_lines.. array.      &scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array.
     if ($nav_error) {      if ($nav_error) {
         $r->print(&navmap_errormsg());          $r->print(&navmap_errormsg());
         return(1,$currentphase);          return(1,$currentphase);
Line 7742  sub scantron_validate_ID { Line 6881  sub scantron_validate_ID {
   
   
 sub scantron_get_correction {  sub scantron_get_correction {
     my ($r,$i,$scan_record,$scan_config,$line,$error,$arg,      my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
         $randomorder,$randompick,$respnumlookup,$startline)=@_;  
 #FIXME in the case of a duplicated ID the previous line, probably need  #FIXME in the case of a duplicated ID the previous line, probably need
 #to show both the current line and the previous one and allow skipping  #to show both the current line and the previous one and allow skipping
 #the previous one or the current one  #the previous one or the current one
   
     if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {      if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
         $r->print(   $r->print("<p>".&mt("<b>An error was detected ($error)</b>".
             '<p class="LC_warning">'      " for PaperID <tt>[_1]</tt>",
            .&mt('An error was detected ([_1]) for PaperID [_2]',      $$scan_record{'scantron.PaperID'})."</p> \n");
                 "<b>$error</b>",      } else {
                 '<tt>'.$$scan_record{'scantron.PaperID'}.'</tt>')   $r->print("<p>".&mt("<b>An error was detected ($error)</b>".
            ."</p> \n");      " in scanline [_1] <pre>[_2]</pre>",
     } else {      $i,$line)."</p> \n");
         $r->print(      }
             '<p class="LC_warning">'      my $message="<p>".&mt("The ID on the form is  <tt>[_1]</tt><br />".
            .&mt('An error was detected ([_1]) in scanline [_2] [_3]',    "The name on the paper is [_2],[_3]",
                 "<b>$error</b>", $i, "<pre>$line</pre>")    $$scan_record{'scantron.ID'},
            ."</p> \n");    $$scan_record{'scantron.LastName'},
     }    $$scan_record{'scantron.FirstName'})."</p>";
     my $message =  
         '<p>'  
        .&mt('The ID on the form is [_1]',  
             "<tt>$$scan_record{'scantron.ID'}</tt>")  
        .'<br />'  
        .&mt('The name on the paper is [_1], [_2]',  
             $$scan_record{'scantron.LastName'},  
             $$scan_record{'scantron.FirstName'})  
        .'</p>';  
   
     $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");      $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
     $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");      $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
Line 7780  sub scantron_get_correction { Line 6909  sub scantron_get_correction {
   
     if ($error =~ /ID$/) {      if ($error =~ /ID$/) {
  if ($error eq 'incorrectID') {   if ($error eq 'incorrectID') {
     $r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist").      $r->print("<p>".&mt("The encoded ID is not in the classlist").
       "</p>\n");        "</p>\n");
  } elsif ($error eq 'duplicateID') {   } elsif ($error eq 'duplicateID') {
     $r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");      $r->print("<p>".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
  }   }
  $r->print($message);   $r->print($message);
  $r->print("<p>".&mt("How should I handle this?")." <br /> \n");   $r->print("<p>".&mt("How should I handle this?")." <br /> \n");
Line 7793  sub scantron_get_correction { Line 6922  sub scantron_get_correction {
  $r->print(&Apache::loncommon::selectstudent_link('scantronupload',   $r->print(&Apache::loncommon::selectstudent_link('scantronupload',
        'scantron_username','scantron_domain'));         'scantron_username','scantron_domain'));
  $r->print(": <input type='text' name='scantron_username' value='' />");   $r->print(": <input type='text' name='scantron_username' value='' />");
  $r->print("\n:\n".   $r->print("\n@".
  &Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain'));   &Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain'));
   
  $r->print('</li>');   $r->print('</li>');
     } elsif ($error =~ /CODE$/) {      } elsif ($error =~ /CODE$/) {
  if ($error eq 'incorrectCODE') {   if ($error eq 'incorrectCODE') {
     $r->print('<p class="LC_warning">'.&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n");      $r->print("<p>".&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n");
  } elsif ($error eq 'duplicateCODE') {   } elsif ($error eq 'duplicateCODE') {
     $r->print('<p class="LC_warning">'.&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");      $r->print("<p>".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");
  }   }
         $r->print("<p>".&mt('The CODE on the form is [_1]',   $r->print("<p>".&mt("The CODE on the form is  <tt>'[_1]'</tt>",
                             "<tt>'$$scan_record{'scantron.CODE'}'</tt>")      $$scan_record{'scantron.CODE'})."<br />\n");
                  ."</p>\n");  
  $r->print($message);   $r->print($message);
  $r->print("<p>".&mt("How should I handle this?")."</p>\n");   $r->print("<p>".&mt("How should I handle this?")." <br /> \n");
  $r->print("\n<br /> ");   $r->print("\n<br /> ");
  my $i=0;   my $i=0;
  if ($error eq 'incorrectCODE'    if ($error eq 'incorrectCODE' 
Line 7834  sub scantron_get_correction { Line 6962  sub scantron_get_correction {
     $r->print("      $r->print("
     <label>      <label>
         <input type='radio' name='scantron_CODE_resolution' value='use_unfound'$checked />          <input type='radio' name='scantron_CODE_resolution' value='use_unfound'$checked />
        ".&mt("Use the CODE [_1] that was on the paper, ignoring the error.",         ".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.",
      "<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."       "<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."
     </label>");      </label>");
     $r->print("\n<br />");      $r->print("\n<br />");
Line 7872  ENDSCRIPT Line 7000  ENDSCRIPT
      "</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />"));       "</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />"));
  $r->print("\n<br /><br />");   $r->print("\n<br /><br />");
     } elsif ($error eq 'doublebubble') {      } elsif ($error eq 'doublebubble') {
  $r->print('<p class="LC_warning">'.&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n");   $r->print("<p>".&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n");
   
  # The form field scantron_questions is acutally a list of line numbers.   # The form field scantron_questions is acutally a list of line numbers.
  # represented by this form so:   # represented by this form so:
   
  my $line_list = &questions_to_line_list($arg,$randomorder,$randompick,   my $line_list = &questions_to_line_list($arg);
                                                 $respnumlookup,$startline);  
   
  $r->print('<input type="hidden" name="scantron_questions" value="'.   $r->print('<input type="hidden" name="scantron_questions" value="'.
   $line_list.'" />');    $line_list.'" />');
Line 7886  ENDSCRIPT Line 7013  ENDSCRIPT
  $r->print("<p>".&mt("Please indicate which bubble should be used for grading")."</p>");   $r->print("<p>".&mt("Please indicate which bubble should be used for grading")."</p>");
  foreach my $question (@{$arg}) {   foreach my $question (@{$arg}) {
     my @linenums = &prompt_for_corrections($r,$question,$scan_config,      my @linenums = &prompt_for_corrections($r,$question,$scan_config,
                                                    $scan_record, $error,                                                     $scan_record, $error);
                                                    $randomorder,$randompick,  
                                                    $respnumlookup,$startline);  
             push(@lines_to_correct,@linenums);              push(@lines_to_correct,@linenums);
  }   }
         $r->print(&verify_bubbles_checked(@lines_to_correct));          $r->print(&verify_bubbles_checked(@lines_to_correct));
     } elsif ($error eq 'missingbubble') {      } elsif ($error eq 'missingbubble') {
  $r->print('<p class="LC_warning">'.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n");   $r->print("<p>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</p>\n");
  $r->print($message);   $r->print($message);
  $r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");   $r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");
  $r->print(&mt("Some questions have no scanned bubbles.")."\n");   $r->print(&mt("Some questions have no scanned bubbles.")."\n");
Line 7902  ENDSCRIPT Line 7027  ENDSCRIPT
  # a list of question numbers. Therefore:   # a list of question numbers. Therefore:
  #   #
   
  my $line_list = &questions_to_line_list($arg,$randomorder,$randompick,   my $line_list = &questions_to_line_list($arg);
                                                 $respnumlookup,$startline);  
   
  $r->print('<input type="hidden" name="scantron_questions" value="'.   $r->print('<input type="hidden" name="scantron_questions" value="'.
   $line_list.'" />');    $line_list.'" />');
  foreach my $question (@{$arg}) {   foreach my $question (@{$arg}) {
     my @linenums = &prompt_for_corrections($r,$question,$scan_config,      my @linenums = &prompt_for_corrections($r,$question,$scan_config,
                                                    $scan_record, $error,                                                     $scan_record, $error);
                                                    $randomorder,$randompick,  
                                                    $respnumlookup,$startline);  
             push(@lines_to_correct,@linenums);              push(@lines_to_correct,@linenums);
  }   }
         $r->print(&verify_bubbles_checked(@lines_to_correct));          $r->print(&verify_bubbles_checked(@lines_to_correct));
Line 7925  sub verify_bubbles_checked { Line 7047  sub verify_bubbles_checked {
     my (@ansnums) = @_;      my (@ansnums) = @_;
     my $ansnumstr = join('","',@ansnums);      my $ansnumstr = join('","',@ansnums);
     my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines.");      my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines.");
     &js_escape(\$warning);      my $output = &Apache::lonhtmlcommon::scripttag((<<ENDSCRIPT));
     my $output = &Apache::lonhtmlcommon::scripttag(<<ENDSCRIPT);  
 function verify_bubble_radio(form) {  function verify_bubble_radio(form) {
     var ansnumArray = new Array ("$ansnumstr");      var ansnumArray = new Array ("$ansnumstr");
     var need_bubble_count = 0;      var need_bubble_count = 0;
Line 7963  used to fill in the scantron_questions f Line 7084  used to fill in the scantron_questions f
   
   Arguments:    Arguments:
      questions    - Reference to an array of questions.       questions    - Reference to an array of questions.
      randomorder  - True if randomorder in use.  
      randompick   - True if randompick in use.  
      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).  
      startline    - Reference to hash where key is question number (0 is first)  
                     and key is number of first bubble line for current student  
                     or code-based randompick and/or randomorder.  
   
 =cut  =cut
   
   
 sub questions_to_line_list {  sub questions_to_line_list {
     my ($questions,$randomorder,$randompick,$respnumlookup,$startline) = @_;      my ($questions) = @_;
     my @lines;      my @lines;
   
     foreach my $item (@{$questions}) {      foreach my $item (@{$questions}) {
Line 7985  sub questions_to_line_list { Line 7098  sub questions_to_line_list {
         if ($item =~ /^(\d+)\.(\d+)$/) {          if ($item =~ /^(\d+)\.(\d+)$/) {
             $question = $1;              $question = $1;
             my $subquestion = $2;              my $subquestion = $2;
             my $responsenum = $question-1;              $first = $first_bubble_line{$question-1} + 1;
             if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {              my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
                 $responsenum = $respnumlookup->{$question-1};  
                 if (ref($startline) eq 'HASH') {  
                     $first = $startline->{$question-1} + 1;  
                 }  
             } else {  
                 $first = $first_bubble_line{$responsenum} + 1;  
             }  
             my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});  
             my $subcount = 1;              my $subcount = 1;
             while ($subcount<$subquestion) {              while ($subcount<$subquestion) {
                 $first += $subans[$subcount-1];                  $first += $subans[$subcount-1];
Line 8002  sub questions_to_line_list { Line 7107  sub questions_to_line_list {
             }              }
             $count = $subans[$subquestion-1];              $count = $subans[$subquestion-1];
         } else {          } else {
             my $responsenum = $question-1;      $first   = $first_bubble_line{$question-1} + 1;
             if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {      $count   = $bubble_lines_per_response{$question-1};
                 $responsenum = $respnumlookup->{$question-1};  
                 if (ref($startline) eq 'HASH') {  
                     $first = $startline->{$question-1} + 1;  
                 }  
             } else {  
                 $first = $first_bubble_line{$responsenum} + 1;  
             }  
             $count   = $bubble_lines_per_response{$responsenum};  
         }          }
         $last = $first+$count-1;          $last = $first+$count-1;
         push(@lines, ($first..$last));          push(@lines, ($first..$last));
Line 8033  for multi and missing bubble cases). Line 7130  for multi and missing bubble cases).
    $scan_config - The scantron file configuration hash.     $scan_config - The scantron file configuration hash.
    $scan_record - Reference to the hash that has the the parsed scanlines.     $scan_record - Reference to the hash that has the the parsed scanlines.
    $error       - Type of error     $error       - Type of error
    $randomorder - True if randomorder in use.  
    $randompick  - True if randompick in use.  
    $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).  
    $startline   - Reference to hash where key is question number (0 is first)  
                   and value is number of first bubble line for current student  
                   or code-based randompick and/or randomorder.  
   
  Implicit inputs:   Implicit inputs:
    %bubble_lines_per_response   - Starting line numbers for each question.     %bubble_lines_per_response   - Starting line numbers for each question.
Line 8065  for multi and missing bubble cases). Line 7154  for multi and missing bubble cases).
 =cut  =cut
   
 sub prompt_for_corrections {  sub prompt_for_corrections {
     my ($r, $question, $scan_config, $scan_record, $error, $randomorder,      my ($r, $question, $scan_config, $scan_record, $error) = @_;
         $randompick, $respnumlookup, $startline) = @_;  
     my ($current_line,$lines);      my ($current_line,$lines);
     my @linenums;      my @linenums;
     my $questionnum = $question;      my $questionnum = $question;
     my ($first,$responsenum);  
     if ($question =~ /^(\d+)\.(\d+)$/) {      if ($question =~ /^(\d+)\.(\d+)$/) {
         $question = $1;          $question = $1;
           $current_line = $first_bubble_line{$question-1} + 1 ;
         my $subquestion = $2;          my $subquestion = $2;
         if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {          my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
             $responsenum = $respnumlookup->{$question-1};  
             if (ref($startline) eq 'HASH') {  
                 $first = $startline->{$question-1};  
             }  
         } else {  
             $responsenum = $question-1;  
             $first = $first_bubble_line{$responsenum};  
         }  
         $current_line = $first + 1 ;  
         my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});  
         my $subcount = 1;          my $subcount = 1;
         while ($subcount<$subquestion) {          while ($subcount<$subquestion) {
             $current_line += $subans[$subcount-1];              $current_line += $subans[$subcount-1];
Line 8092  sub prompt_for_corrections { Line 7170  sub prompt_for_corrections {
         }          }
         $lines = $subans[$subquestion-1];          $lines = $subans[$subquestion-1];
     } else {      } else {
         if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {          $current_line = $first_bubble_line{$question-1} + 1 ;
             $responsenum = $respnumlookup->{$question-1};          $lines        = $bubble_lines_per_response{$question-1};
             if (ref($startline) eq 'HASH') {  
                 $first = $startline->{$question-1};  
             }  
         } else {  
             $responsenum = $question-1;  
             $first = $first_bubble_line{$responsenum};  
         }  
         $current_line = $first + 1;  
         $lines        = $bubble_lines_per_response{$responsenum};  
     }      }
     if ($lines > 1) {      if ($lines > 1) {
         $r->print(&mt('The group of bubble lines below responds to a single question.').'<br />');          $r->print(&mt('The group of bubble lines below responds to a single question.').'<br />');
         if (($responsetype_per_response{$responsenum} eq 'essayresponse') ||          if (($responsetype_per_response{$question-1} eq 'essayresponse') ||
             ($responsetype_per_response{$responsenum} eq 'formularesponse') ||              ($responsetype_per_response{$question-1} eq 'formularesponse') ||
             ($responsetype_per_response{$responsenum} eq 'stringresponse') ||              ($responsetype_per_response{$question-1} eq 'stringresponse') ||
             ($responsetype_per_response{$responsenum} eq 'imageresponse') ||              ($responsetype_per_response{$question-1} eq 'imageresponse') ||
             ($responsetype_per_response{$responsenum} eq 'reactionresponse') ||              ($responsetype_per_response{$question-1} eq 'reactionresponse') ||
             ($responsetype_per_response{$responsenum} eq 'organicresponse')) {              ($responsetype_per_response{$question-1} 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).'<br /><br />'.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.').'<br />'.&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.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />');              $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.').'<br />'.&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.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />');
         } else {          } else {
             $r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");              $r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");
         }          }
     }      }
     for (my $i =0; $i < $lines; $i++) {      for (my $i =0; $i < $lines; $i++) {
         my $selected = $$scan_record{"scantron.$current_line.answer"};          my $selected = $$scan_record{"scantron.$current_line.answer"};
  &scantron_bubble_selector($r,$scan_config,$current_line,   &scantron_bubble_selector($r,$scan_config,$current_line, 
           $questionnum,$error,split('', $selected));            $questionnum,$error,split('', $selected));
         push(@linenums,$current_line);          push(@linenums,$current_line);
  $current_line++;   $current_line++;
Line 8139  sub prompt_for_corrections { Line 7208  sub prompt_for_corrections {
   
  Arguments:   Arguments:
     $r           - Apache request object      $r           - Apache request object
     $scan_config - hash from &Apache::lonnet::get_scantron_config()      $scan_config - hash from &get_scantron_config()
     $line        - Number of the line being displayed.      $line        - Number of the line being displayed.
     $questionnum - Question number (may include subquestion)      $questionnum - Question number (may include subquestion)
     $error       - Type of error.      $error       - Type of error.
Line 8152  sub scantron_bubble_selector { Line 7221  sub scantron_bubble_selector {
     my $max=$$scan_config{'Qlength'};      my $max=$$scan_config{'Qlength'};
   
     my $scmode=$$scan_config{'Qon'};      my $scmode=$$scan_config{'Qon'};
     if ($scmode eq 'number' || $scmode eq 'letter') {      if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }     
         if (($$scan_config{'BubblesPerRow'} =~ /^\d+$/) &&  
             ($$scan_config{'BubblesPerRow'} > 0)) {  
             $max=$$scan_config{'BubblesPerRow'};  
             if (($scmode eq 'number') && ($max > 10)) {  
                 $max = 10;  
             } elsif (($scmode eq 'letter') && $max > 26) {  
                 $max = 26;  
             }  
         } else {  
             $max = 10;  
         }  
     }  
   
     my @alphabet=('A'..'Z');      my @alphabet=('A'..'Z');
     $r->print(&Apache::loncommon::start_data_table().      $r->print(&Apache::loncommon::start_data_table().
Line 8303  sub get_codes { Line 7360  sub get_codes {
   
 sub scantron_validate_CODE {  sub scantron_validate_CODE {
     my ($r,$currentphase) = @_;      my ($r,$currentphase) = @_;
     my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     if ($scantron_config{'CODElocation'} &&      if ($scantron_config{'CODElocation'} &&
  $scantron_config{'CODEstart'} &&   $scantron_config{'CODEstart'} &&
  $scantron_config{'CODElength'}) {   $scantron_config{'CODElength'}) {
Line 8319  sub scantron_validate_CODE { Line 7376  sub scantron_validate_CODE {
     my %allcodes=&get_codes();      my %allcodes=&get_codes();
   
     my $nav_error;      my $nav_error;
     &scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the lines per response array.      &scantron_get_maxbubble(\$nav_error); # parse needs the lines per response array.
     if ($nav_error) {      if ($nav_error) {
         $r->print(&navmap_errormsg());          $r->print(&navmap_errormsg());
         return(1,$currentphase);          return(1,$currentphase);
Line 8373  sub scantron_validate_doublebubble { Line 7430  sub scantron_validate_doublebubble {
     #get student info      #get student info
     my $classlist=&Apache::loncoursedata::get_classlist();      my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);      my %idmap=&username_to_idmap($classlist);
     my (undef,undef,$sequence)=  
         &Apache::lonnet::decode_symb($env{'form.selectpage'});  
   
     #get scantron line setup      #get scantron line setup
     my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();      my ($scanlines,$scan_data)=&scantron_getfile();
   
     my $navmap = Apache::lonnavmaps::navmap->new();  
     unless (ref($navmap)) {  
         $r->print(&navmap_errormsg());  
         return(1,$currentphase);  
     }  
     my $map=$navmap->getResourceByUrl($sequence);  
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);  
     my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,  
         %grader_randomlists_by_symb,%orderedforcode,%respnumlookup,%startline);  
     my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);  
   
     my $nav_error;      my $nav_error;
     if (ref($map)) {      &scantron_get_maxbubble(\$nav_error); # parse needs the bubble line array.
         $randomorder = $map->randomorder();  
         $randompick = $map->randompick();  
         if ($randomorder || $randompick) {  
             $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);  
             if ($nav_error) {  
                 $r->print(&navmap_errormsg());  
                 return(1,$currentphase);  
             }  
             &graders_resources_pass(\@resources,\%grader_partids_by_symb,  
                                     \%grader_randomlists_by_symb,$bubbles_per_row);  
         }  
     } else {  
         $r->print(&navmap_errormsg());  
         return(1,$currentphase);  
     }  
   
     &scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble line array.  
     if ($nav_error) {      if ($nav_error) {
         $r->print(&navmap_errormsg());          $r->print(&navmap_errormsg());
         return(1,$currentphase);          return(1,$currentphase);
Line 8419  sub scantron_validate_doublebubble { Line 7445  sub scantron_validate_doublebubble {
  my $line=&scantron_get_line($scanlines,$scan_data,$i);   my $line=&scantron_get_line($scanlines,$scan_data,$i);
  if ($line=~/^[\s\cz]*$/) { next; }   if ($line=~/^[\s\cz]*$/) { next; }
  my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,   my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
  $scan_data,undef,\%idmap,$randomorder,   $scan_data);
                                                  $randompick,$sequence,\@master_seq,  
                                                  \%symb_to_resource,\%grader_partids_by_symb,  
                                                  \%orderedforcode,\%respnumlookup,\%startline);  
  if (!defined($$scan_record{'scantron.doubleerror'})) { next; }   if (!defined($$scan_record{'scantron.doubleerror'})) { next; }
  &scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line,   &scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line,
  'doublebubble',   'doublebubble',
  $$scan_record{'scantron.doubleerror'},   $$scan_record{'scantron.doubleerror'});
                                  $randomorder,$randompick,\%respnumlookup,\%startline);  
     return (1,$currentphase);      return (1,$currentphase);
     }      }
     return (0,$currentphase+1);      return (0,$currentphase+1);
Line 8435  sub scantron_validate_doublebubble { Line 7457  sub scantron_validate_doublebubble {
   
   
 sub scantron_get_maxbubble {  sub scantron_get_maxbubble {
     my ($nav_error,$scantron_config) = @_;      my ($nav_error) = @_;
     if (defined($env{'form.scantron_maxbubble'}) &&      if (defined($env{'form.scantron_maxbubble'}) &&
  $env{'form.scantron_maxbubble'}) {   $env{'form.scantron_maxbubble'}) {
  &restore_bubble_lines();   &restore_bubble_lines();
Line 8454  sub scantron_get_maxbubble { Line 7476  sub scantron_get_maxbubble {
     }      }
     my $map=$navmap->getResourceByUrl($sequence);      my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);      my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     my $bubbles_per_row = &bubblesheet_bubbles_per_row($scantron_config);  
   
     &Apache::lonxml::clear_problem_counter();      &Apache::lonxml::clear_problem_counter();
   
Line 8466  sub scantron_get_maxbubble { Line 7487  sub scantron_get_maxbubble {
     %first_bubble_line         = ();      %first_bubble_line         = ();
     %subdivided_bubble_lines   = ();      %subdivided_bubble_lines   = ();
     %responsetype_per_response = ();      %responsetype_per_response = ();
     %masterseq_id_responsenum  = ();  
   
     my $response_number = 0;      my $response_number = 0;
     my $bubble_line     = 0;      my $bubble_line     = 0;
     foreach my $resource (@resources) {      foreach my $resource (@resources) {
         my $resid = $resource->id();          my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom);
         my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,  
                                                           $udom,undef,$bubbles_per_row);  
         if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {          if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
     foreach my $part_id (@{$parts}) {      foreach my $part_id (@{$parts}) {
                 my $lines;                  my $lines;
Line 8502  sub scantron_get_maxbubble { Line 7520  sub scantron_get_maxbubble {
                     if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') {                      if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') {
                         $numshown = scalar(@{$analysis->{$part_id.'.shown'}});                          $numshown = scalar(@{$analysis->{$part_id.'.shown'}});
                     }                      }
                     my $bubbles_per_row =                      my $bubbles_per_line = 10;
                         &bubblesheet_bubbles_per_row($scantron_config);                      my $inner_bubble_lines = int($numbub/$bubbles_per_line);
                     my $inner_bubble_lines = int($numbub/$bubbles_per_row);                      if (($numbub % $bubbles_per_line) != 0) {
                     if (($numbub % $bubbles_per_row) != 0) {  
                         $inner_bubble_lines++;                          $inner_bubble_lines++;
                     }                      }
                     for (my $i=0; $i<$numshown; $i++) {                      for (my $i=0; $i<$numshown; $i++) {
Line 8516  sub scantron_get_maxbubble { Line 7533  sub scantron_get_maxbubble {
                     $lines = $numshown * $inner_bubble_lines;                      $lines = $numshown * $inner_bubble_lines;
                 } else {                  } else {
                     $lines = $analysis->{"$part_id.bubble_lines"};                      $lines = $analysis->{"$part_id.bubble_lines"};
                 }                  } 
   
                 $first_bubble_line{$response_number} = $bubble_line;                  $first_bubble_line{$response_number} = $bubble_line;
         $bubble_lines_per_response{$response_number} = $lines;          $bubble_lines_per_response{$response_number} = $lines;
                 $responsetype_per_response{$response_number} =                   $responsetype_per_response{$response_number} = 
                     $analysis->{$part_id.'.type'};                      $analysis->{$part_id.'.type'};
                 $masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number;  
         $response_number++;          $response_number++;
   
         $bubble_line +=  $lines;          $bubble_line +=  $lines;
Line 8538  sub scantron_get_maxbubble { Line 7554  sub scantron_get_maxbubble {
     return $env{'form.scantron_maxbubble'};      return $env{'form.scantron_maxbubble'};
 }  }
   
 sub bubblesheet_bubbles_per_row {  
     my ($scantron_config) = @_;  
     my $bubbles_per_row;  
     if (ref($scantron_config) eq 'HASH') {  
         $bubbles_per_row = $scantron_config->{'BubblesPerRow'};  
     }  
     if ((!$bubbles_per_row) || ($bubbles_per_row < 1)) {  
         $bubbles_per_row = 10;  
     }  
     return $bubbles_per_row;  
 }  
   
 sub scantron_validate_missingbubbles {  sub scantron_validate_missingbubbles {
     my ($r,$currentphase) = @_;      my ($r,$currentphase) = @_;
     #get student info      #get student info
     my $classlist=&Apache::loncoursedata::get_classlist();      my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);      my %idmap=&username_to_idmap($classlist);
     my (undef,undef,$sequence)=  
         &Apache::lonnet::decode_symb($env{'form.selectpage'});  
   
     #get scantron line setup      #get scantron line setup
     my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();      my ($scanlines,$scan_data)=&scantron_getfile();
   
     my $navmap = Apache::lonnavmaps::navmap->new();  
     unless (ref($navmap)) {  
         $r->print(&navmap_errormsg());  
         return(1,$currentphase);  
     }  
   
     my $map=$navmap->getResourceByUrl($sequence);  
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);  
     my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,  
         %grader_randomlists_by_symb,%orderedforcode,%respnumlookup,%startline);  
     my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);  
   
     my $nav_error;      my $nav_error;
     if (ref($map)) {      my $max_bubble=&scantron_get_maxbubble(\$nav_error);
         $randomorder = $map->randomorder();  
         $randompick = $map->randompick();  
         if ($randomorder || $randompick) {  
             $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);  
             if ($nav_error) {  
                 $r->print(&navmap_errormsg());  
                 return(1,$currentphase);  
             }  
             &graders_resources_pass(\@resources,\%grader_partids_by_symb,  
                                     \%grader_randomlists_by_symb,$bubbles_per_row);  
         }  
     } else {  
         $r->print(&navmap_errormsg());  
         return(1,$currentphase);  
     }  
   
   
     my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);  
     if ($nav_error) {      if ($nav_error) {
         $r->print(&navmap_errormsg());  
         return(1,$currentphase);          return(1,$currentphase);
     }      }
   
     if (!$max_bubble) { $max_bubble=2**31; }      if (!$max_bubble) { $max_bubble=2**31; }
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {      for (my $i=0;$i<=$scanlines->{'count'};$i++) {
  my $line=&scantron_get_line($scanlines,$scan_data,$i);   my $line=&scantron_get_line($scanlines,$scan_data,$i);
  if ($line=~/^[\s\cz]*$/) { next; }   if ($line=~/^[\s\cz]*$/) { next; }
         my $scan_record =   my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
             &scantron_parse_scanline($line,$i,\%scantron_config,$scan_data,undef,\%idmap,   $scan_data);
                                      $randomorder,$randompick,$sequence,\@master_seq,  
                                      \%symb_to_resource,\%grader_partids_by_symb,  
                                      \%orderedforcode,\%respnumlookup,\%startline);  
  if (!defined($$scan_record{'scantron.missingerror'})) { next; }   if (!defined($$scan_record{'scantron.missingerror'})) { next; }
  my @to_correct;   my @to_correct;
   
Line 8616  sub scantron_validate_missingbubbles { Line 7582  sub scantron_validate_missingbubbles {
  foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {   foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
             my $lastbubble;              my $lastbubble;
             if ($missing =~ /^(\d+)\.(\d+)$/) {              if ($missing =~ /^(\d+)\.(\d+)$/) {
                 my $question = $1;                 my $question = $1;
                 my $subquestion = $2;                 my $subquestion = $2;
                 my ($first,$responsenum);                 if (!defined($first_bubble_line{$question -1})) { next; }
                 if ($randomorder || $randompick) {                 my $first = $first_bubble_line{$question-1};
                     $responsenum = $respnumlookup{$question-1};                 my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
                     $first = $startline{$question-1};                 my $subcount = 1;
                 } else {                 while ($subcount<$subquestion) {
                     $responsenum = $question-1;                     $first += $subans[$subcount-1];
                     $first = $first_bubble_line{$responsenum};                     $subcount ++;
                 }                 }
                 if (!defined($first)) { next; }                 my $count = $subans[$subquestion-1];
                 my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});                 $lastbubble = $first + $count;
                 my $subcount = 1;  
                 while ($subcount<$subquestion) {  
                     $first += $subans[$subcount-1];  
                     $subcount ++;  
                 }  
                 my $count = $subans[$subquestion-1];  
                 $lastbubble = $first + $count;  
             } else {              } else {
                 my ($first,$responsenum);                  if (!defined($first_bubble_line{$missing - 1})) { next; }
                 if ($randomorder || $randompick) {                  $lastbubble = $first_bubble_line{$missing - 1} + $bubble_lines_per_response{$missing - 1};
                     $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; }              if ($lastbubble > $max_bubble) { next; }
     push(@to_correct,$missing);      push(@to_correct,$missing);
  }   }
  if (@to_correct) {   if (@to_correct) {
     &scantron_get_correction($r,$i,$scan_record,\%scantron_config,      &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
      $line,'missingbubble',\@to_correct,       $line,'missingbubble',\@to_correct);
                                      $randomorder,$randompick,\%respnumlookup,  
                                      \%startline);  
     return (1,$currentphase);      return (1,$currentphase);
  }   }
   
Line 8662  sub scantron_validate_missingbubbles { Line 7611  sub scantron_validate_missingbubbles {
     return (0,$currentphase+1);      return (0,$currentphase+1);
 }  }
   
 sub hand_bubble_option {  
     my (undef, undef, $sequence) =  
         &Apache::lonnet::decode_symb($env{'form.selectpage'});  
     return if ($sequence eq '');  
     my $navmap = Apache::lonnavmaps::navmap->new();  
     unless (ref($navmap)) {  
         return;  
     }  
     my $needs_hand_bubbles;  
     my $map=$navmap->getResourceByUrl($sequence);  
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);  
     foreach my $res (@resources) {  
         if (ref($res)) {  
             if ($res->is_problem()) {  
                 my $partlist = $res->parts();  
                 foreach my $part (@{ $partlist }) {  
                     my @types = $res->responseType($part);  
                     if (grep(/^(chem|essay|image|formula|math|string|functionplot)$/,@types)) {  
                         $needs_hand_bubbles = 1;  
                         last;  
                     }  
                 }  
             }  
         }  
     }  
     if ($needs_hand_bubbles) {  
         my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});  
         my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);  
         return &mt('The sequence to be graded contains response types which are handgraded.').'<p>'.  
                &mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','<br />').  
                '<label><input type="radio" name="scantron_lastbubblepoints" value="'.$bubbles_per_row.'" checked="checked" />'.&mt('[quant,_1,point]',$bubbles_per_row).'</label>&nbsp;'.&mt('or').'&nbsp;'.  
                '<label><input type="radio" name="scantron_lastbubblepoints" value="0" />'.&mt('0 points').'</label></p>';  
     }  
     return;  
 }  
   
 sub scantron_process_students {  sub scantron_process_students {
     my ($r,$symb) = @_;      my ($r) = @_;
   
     my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});      my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});
       my ($symb)=&get_symb($r);
     if (!$symb) {      if (!$symb) {
  return '';   return '';
     }      }
     my $default_form_data=&defaultFormData($symb);      my $default_form_data=&defaultFormData($symb);
   
     my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);  
     my ($scanlines,$scan_data)=&scantron_getfile();      my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();      my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);      my %idmap=&username_to_idmap($classlist);
Line 8716  sub scantron_process_students { Line 7630  sub scantron_process_students {
     unless (ref($navmap)) {      unless (ref($navmap)) {
         $r->print(&navmap_errormsg());          $r->print(&navmap_errormsg());
         return '';          return '';
     }      }  
     my $map=$navmap->getResourceByUrl($sequence);      my $map=$navmap->getResourceByUrl($sequence);
     my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,  
         %grader_randomlists_by_symb);  
     if (ref($map)) {  
         $randomorder = $map->randomorder();  
         $randompick = $map->randompick();  
     } else {  
         $r->print(&navmap_errormsg());  
         return '';  
     }  
     my $nav_error;  
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);      my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     if ($randomorder || $randompick) {      my (%grader_partids_by_symb,%grader_randomlists_by_symb);
         $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);      &graders_resources_pass(\@resources,\%grader_partids_by_symb,
         if ($nav_error) {                              \%grader_randomlists_by_symb);
             $r->print(&navmap_errormsg());      my $resource_error;
             return '';      foreach my $resource (@resources) {
           my $ressymb;
           if (ref($resource)) {
               $ressymb = $resource->symb();
           } else {
               $resource_error = 1;
               last;
           }
           my ($analysis,$parts) =
               &scantron_partids_tograde($resource,$env{'request.course.id'},
                                         $env{'user.name'},$env{'user.domain'},1);
           $grader_partids_by_symb{$ressymb} = $parts;
           if (ref($analysis) eq 'HASH') {
               if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
                   $grader_randomlists_by_symb{$ressymb} = 
                       $analysis->{'parts_withrandomlist'};
               }
         }          }
     }      }
     &graders_resources_pass(\@resources,\%grader_partids_by_symb,      if ($resource_error) {
                             \%grader_randomlists_by_symb,$bubbles_per_row);          $r->print(&navmap_errormsg());
           return '';
       }
   
     my ($uname,$udom);      my ($uname,$udom);
     my $result= <<SCANTRONFORM;      my $result= <<SCANTRONFORM;
Line 8752  SCANTRONFORM Line 7674  SCANTRONFORM
           
     my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));      my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
     my $count=&get_todo_count($scanlines,$scan_data);      my $count=&get_todo_count($scanlines,$scan_data);
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student');       'Bubblesheet Progress',$count,
       'inline',undef,'scantronupload');
       &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
     'Processing first student');
     $r->print('<br />');      $r->print('<br />');
     my $start=&Time::HiRes::time();      my $start=&Time::HiRes::time();
     my $i=-1;      my $i=-1;
     my $started;      my $started;
   
     &scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.      my $nav_error;
       &scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
     if ($nav_error) {      if ($nav_error) {
         $r->print(&navmap_errormsg());          $r->print(&navmap_errormsg());
         return '';          return '';
Line 8771  SCANTRONFORM Line 7697  SCANTRONFORM
     if ($ssi_error) {      if ($ssi_error) {
  $r->print("</form>");   $r->print("</form>");
  &ssi_print_error($r);   &ssi_print_error($r);
    $r->print(&show_grading_menu_form($symb));
         &Apache::lonnet::remove_lock($lock);          &Apache::lonnet::remove_lock($lock);
  return ''; # Dunno why the other returns return '' rather than just returning.   return ''; # Dunno why the other returns return '' rather than just returning.
     }      }
   
     my %lettdig = &Apache::lonnet::letter_to_digits();      my %lettdig = &letter_to_digits();
     my $numletts = scalar(keys(%lettdig));      my $numletts = scalar(keys(%lettdig));
     my %orderedforcode;  
   
     while ($i<$scanlines->{'count'}) {      while ($i<$scanlines->{'count'}) {
   ($uname,$udom)=('','');    ($uname,$udom)=('','');
Line 8785  SCANTRONFORM Line 7711  SCANTRONFORM
   my $line=&scantron_get_line($scanlines,$scan_data,$i);    my $line=&scantron_get_line($scanlines,$scan_data,$i);
   if ($line=~/^[\s\cz]*$/) { next; }    if ($line=~/^[\s\cz]*$/) { next; }
  if ($started) {   if ($started) {
     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');      &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
        'last student');
  }   }
  $started=1;   $started=1;
         my %respnumlookup = ();  
         my %startline = ();  
         my $total;  
   my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,    my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
   $scan_data,undef,\%idmap,$randomorder,    $scan_data);
                                                  $randompick,$sequence,\@master_seq,  
                                                  \%symb_to_resource,\%grader_partids_by_symb,  
                                                  \%orderedforcode,\%respnumlookup,\%startline,  
                                                  \$total);  
   unless ($uname=&scantron_find_student($scan_record,$scan_data,    unless ($uname=&scantron_find_student($scan_record,$scan_data,
        \%idmap,$i)) {         \%idmap,$i)) {
      &scantron_add_delay(\@delayqueue,$line,       &scantron_add_delay(\@delayqueue,$line,
Line 8808  SCANTRONFORM Line 7728  SCANTRONFORM
   'Student '.$uname.' has multiple sheets',2);    'Student '.$uname.' has multiple sheets',2);
      next;       next;
   }    }
         my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION];  
         my $user = $uname.':'.$usec;  
   ($uname,$udom)=split(/:/,$uname);    ($uname,$udom)=split(/:/,$uname);
   
         my $scancode;  
         if ((exists($scan_record->{'scantron.CODE'})) &&  
             (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {  
             $scancode = $scan_record->{'scantron.CODE'};  
         } else {  
             $scancode = '';  
         }  
   
         my @mapresources = @resources;  
         if ($randomorder || $randompick) {  
             @mapresources =  
                 &users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource,  
                              \%orderedforcode);  
         }  
         my (%partids_by_symb,$res_error);          my (%partids_by_symb,$res_error);
         foreach my $resource (@mapresources) {          foreach my $resource (@resources) {
             my $ressymb;              my $ressymb;
             if (ref($resource)) {              if (ref($resource)) {
                 $ressymb = $resource->symb();                  $ressymb = $resource->symb();
Line 8837  SCANTRONFORM Line 7741  SCANTRONFORM
             }              }
             if ((exists($grader_randomlists_by_symb{$ressymb})) ||              if ((exists($grader_randomlists_by_symb{$ressymb})) ||
                 (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {                  (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
                 my $currcode;  
                 if (exists($grader_randomlists_by_symb{$ressymb})) {  
                     $currcode = $scancode;  
                 }  
                 my ($analysis,$parts) =                  my ($analysis,$parts) =
                     &scantron_partids_tograde($resource,$env{'request.course.id'},                      &scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);
                                               $uname,$udom,undef,$bubbles_per_row,  
                                               $currcode);  
                 $partids_by_symb{$ressymb} = $parts;                  $partids_by_symb{$ressymb} = $parts;
             } else {              } else {
                 $partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};                  $partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};
Line 8864  SCANTRONFORM Line 7762  SCANTRONFORM
     &scantron_putfile($scanlines,$scan_data);      &scantron_putfile($scanlines,$scan_data);
  }   }
   
           my $scancode;
           if ((exists($scan_record->{'scantron.CODE'})) &&
               (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
               $scancode = $scan_record->{'scantron.CODE'};
           } else {
               $scancode = '';
           }
   
         if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,          if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
                                    \@mapresources,\%partids_by_symb,                                     \@resources,\%partids_by_symb) eq 'ssi_error') {
                                    $bubbles_per_row,$randomorder,$randompick,  
                                    \%respnumlookup,\%startline)   
             eq 'ssi_error') {  
             $ssi_error = 0; # So end of handler error message does not trigger.              $ssi_error = 0; # So end of handler error message does not trigger.
             $r->print("</form>");              $r->print("</form>");
             &ssi_print_error($r);              &ssi_print_error($r);
               $r->print(&show_grading_menu_form($symb));
             &Apache::lonnet::remove_lock($lock);              &Apache::lonnet::remove_lock($lock);
             return '';      # Why return ''?  Beats me.              return '';      # Why return ''?  Beats me.
         }          }
   
         if (($scancode) && ($randomorder || $randompick)) {  
             my $parmresult =  
                 &Apache::lonparmset::storeparm_by_symb($symb,  
                                                        '0_examcode',2,$scancode,  
                                                        'string_examcode',$uname,  
                                                        $udom);  
         }  
  $completedstudents{$uname}={'line'=>$line};   $completedstudents{$uname}={'line'=>$line};
         if ($env{'form.verifyrecord'}) {          if ($env{'form.verifyrecord'}) {
             my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};              my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
             if ($randompick) {  
                 if ($total) {  
                     $lastpos = $total*$scantron_config{'Qlength'};  
                 }  
             }  
   
             my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos);              my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
             chomp($studentdata);              chomp($studentdata);
             $studentdata =~ s/\r$//;              $studentdata =~ s/\r$//;
             my $studentrecord = '';              my $studentrecord = '';
             my $counter = -1;              my $counter = -1;
             foreach my $resource (@mapresources) {              foreach my $resource (@resources) {
                 my $ressymb = $resource->symb();                  my $ressymb = $resource->symb();
                 ($counter,my $recording) =                  ($counter,my $recording) =
                     &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},                      &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
                                              $counter,$studentdata,$partids_by_symb{$ressymb},                                               $counter,$studentdata,$partids_by_symb{$ressymb},
                                              \%scantron_config,\%lettdig,$numletts,$randomorder,                                               \%scantron_config,\%lettdig,$numletts);
                                              $randompick,\%respnumlookup,\%startline);  
                 $studentrecord .= $recording;                  $studentrecord .= $recording;
             }              }
             if ($studentrecord ne $studentdata) {              if ($studentrecord ne $studentdata) {
                 &Apache::lonxml::clear_problem_counter();                  &Apache::lonxml::clear_problem_counter();
                 if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,                  if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
                                            \@mapresources,\%partids_by_symb,                                             \@resources,\%partids_by_symb) eq 'ssi_error') {
                                            $bubbles_per_row,$randomorder,$randompick,  
                                            \%respnumlookup,\%startline)  
                     eq 'ssi_error') {  
                     $ssi_error = 0; # So end of handler error message does not trigger.                      $ssi_error = 0; # So end of handler error message does not trigger.
                     $r->print("</form>");                      $r->print("</form>");
                     &ssi_print_error($r);                      &ssi_print_error($r);
                       $r->print(&show_grading_menu_form($symb));
                     &Apache::lonnet::remove_lock($lock);                      &Apache::lonnet::remove_lock($lock);
                     delete($completedstudents{$uname});                      delete($completedstudents{$uname});
                     return '';                      return '';
                 }                  }
                 $counter = -1;                  $counter = -1;
                 $studentrecord = '';                  $studentrecord = '';
                 foreach my $resource (@mapresources) {                  foreach my $resource (@resources) {
                     my $ressymb = $resource->symb();                      my $ressymb = $resource->symb();
                     ($counter,my $recording) =                      ($counter,my $recording) =
                         &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},                          &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
                                                  $counter,$studentdata,$partids_by_symb{$ressymb},                                                   $counter,$studentdata,$partids_by_symb{$ressymb},
                                                  \%scantron_config,\%lettdig,$numletts,                                                   \%scantron_config,\%lettdig,$numletts);
                                                  $randomorder,$randompick,\%respnumlookup,  
                                                  \%startline);  
                     $studentrecord .= $recording;                      $studentrecord .= $recording;
                 }                  }
                 if ($studentrecord ne $studentdata) {                  if ($studentrecord ne $studentdata) {
                     $r->print('<p><span class="LC_warning">');                      $r->print('<p><span class="LC_error">');
                     if ($scancode eq '') {                      if ($scancode eq '') {
                         $r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2].',                          $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].',
                                   $uname.':'.$udom,$scan_record->{'scantron.ID'}));                                    $uname.':'.$udom,$scan_record->{'scantron.ID'}));
                     } else {                      } else {
                         $r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2] and CODE: [_3].',                          $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].',
                                   $uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode));                                    $uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode));
                     }                      }
                     $r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n".                      $r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n".
Line 8946  SCANTRONFORM Line 7832  SCANTRONFORM
                               '<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'.                                '<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'.
                               &Apache::loncommon::end_data_table_header_row()."\n".                                &Apache::loncommon::end_data_table_header_row()."\n".
                               &Apache::loncommon::start_data_table_row().                                &Apache::loncommon::start_data_table_row().
                               '<td>'.&mt('Bubblesheet').'</td>'.                                '<td>'.&mt('Bubble Sheet').'</td>'.
                               '<td><span class="LC_nobreak" style="white-space: pre;"><tt>'.$studentdata.'</tt></span></td>'.                                '<td><span class="LC_nobreak">'.$studentdata.'</span></td>'.
                               &Apache::loncommon::end_data_table_row().                                &Apache::loncommon::end_data_table_row().
                               &Apache::loncommon::start_data_table_row().                                &Apache::loncommon::start_data_table_row().
                               '<td>'.&mt('Stored submissions').'</td>'.                                '<td>Stored submissions</td>'.
                               '<td><span class="LC_nobreak" style="white-space: pre;"><tt>'.$studentrecord.'</tt></span></td>'."\n".                                '<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n".
                               &Apache::loncommon::end_data_table_row().                                &Apache::loncommon::end_data_table_row().
                               &Apache::loncommon::end_data_table().'</p>');                                &Apache::loncommon::end_data_table().'</p>');
                 } else {                  } else {
Line 8973  SCANTRONFORM Line 7859  SCANTRONFORM
 #    $r->print("<p>took $lasttime</p>");  #    $r->print("<p>took $lasttime</p>");
   
     $r->print("</form>");      $r->print("</form>");
       $r->print(&show_grading_menu_form($symb));
     return '';      return '';
 }  }
   
 sub graders_resources_pass {  sub graders_resources_pass {
     my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb,      my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb) = @_;
         $bubbles_per_row) = @_;  
     if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) &&       if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) && 
         (ref($grader_randomlists_by_symb) eq 'HASH')) {          (ref($grader_randomlists_by_symb) eq 'HASH')) {
         foreach my $resource (@{$resources}) {          foreach my $resource (@{$resources}) {
             my $ressymb = $resource->symb();              my $ressymb = $resource->symb();
             my ($analysis,$parts) =              my ($analysis,$parts) =
                 &scantron_partids_tograde($resource,$env{'request.course.id'},                  &scantron_partids_tograde($resource,$env{'request.course.id'},
                                           $env{'user.name'},$env{'user.domain'},                                            $env{'user.name'},$env{'user.domain'},1);
                                           1,$bubbles_per_row);  
             $grader_partids_by_symb->{$ressymb} = $parts;              $grader_partids_by_symb->{$ressymb} = $parts;
             if (ref($analysis) eq 'HASH') {              if (ref($analysis) eq 'HASH') {
                 if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {                  if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
Line 8999  sub graders_resources_pass { Line 7884  sub graders_resources_pass {
     return;      return;
 }  }
   
 =pod  
   
 =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  
   "NAMEd" exam.  
   
   Should be used when randomorder and/or randompick applied when the   
   corresponding exam was printed, prior to students completing bubblesheets   
   for the version of the exam the student received.  
   
 =cut  
   
 sub users_order  {  
     my ($user,$scancode,$mapurl,$master_seq,$symb_to_resource,$orderedforcode) = @_;  
     my @mapresources;  
     unless ((ref($master_seq) eq 'ARRAY') && (ref($symb_to_resource) eq 'HASH')) {  
         return @mapresources;  
     }  
     if ($scancode) {  
         if ((ref($orderedforcode) eq 'HASH') && (ref($orderedforcode->{$scancode}) eq 'ARRAY')) {  
             @mapresources = @{$orderedforcode->{$scancode}};  
         } else {  
             $env{'form.CODE'} = $scancode;  
             my $actual_seq =  
                 &Apache::lonprintout::master_seq_to_person_seq($mapurl,  
                                                                $master_seq,  
                                                                $user,$scancode,1);  
             if (ref($actual_seq) eq 'ARRAY') {  
                 @mapresources = map { $symb_to_resource->{$_}; } @{$actual_seq};  
                 if (ref($orderedforcode) eq 'HASH') {  
                     if (@mapresources > 0) {  
                         $orderedforcode->{$scancode} = \@mapresources;  
                     }  
                 }  
             }  
             delete($env{'form.CODE'});  
         }  
     } else {  
         my $actual_seq =  
             &Apache::lonprintout::master_seq_to_person_seq($mapurl,  
                                                            $master_seq,  
                                                            $user,undef,1);  
         if (ref($actual_seq) eq 'ARRAY') {  
             @mapresources =  
                 map { $symb_to_resource->{$_}; } @{$actual_seq};  
         }  
     }  
     return @mapresources;  
 }  
   
 sub grade_student_bubbles {  sub grade_student_bubbles {
     my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts,$bubbles_per_row,      my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts) = @_;
         $randomorder,$randompick,$respnumlookup,$startline) = @_;  
     my $uselookup = 0;  
     if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH') &&  
         (ref($startline) eq 'HASH')) {  
         $uselookup = 1;  
     }  
   
     if (ref($resources) eq 'ARRAY') {      if (ref($resources) eq 'ARRAY') {
         my $count = 0;          my $count = 0;
         foreach my $resource (@{$resources}) {          foreach my $resource (@{$resources}) {
Line 9072  sub grade_student_bubbles { Line 7898  sub grade_student_bubbles {
                         'grade_symb'     => $ressymb,                          'grade_symb'     => $ressymb,
                         'CODE'           => $scancode                          'CODE'           => $scancode
                        );                         );
             if ($bubbles_per_row ne '') {  
                 $form{'bubbles_per_row'} = $bubbles_per_row;  
             }  
             if ($env{'form.scantron_lastbubblepoints'} ne '') {  
                 $form{'scantron_lastbubblepoints'} = $env{'form.scantron_lastbubblepoints'};  
             }  
             if (ref($parts) eq 'HASH') {              if (ref($parts) eq 'HASH') {
                 if (ref($parts->{$ressymb}) eq 'ARRAY') {                  if (ref($parts->{$ressymb}) eq 'ARRAY') {
                     foreach my $part (@{$parts->{$ressymb}}) {                      foreach my $part (@{$parts->{$ressymb}}) {
                         if ($uselookup) {                          $form{'scantron_questnum_start.'.$part} =
                             $form{'scantron_questnum_start.'.$part} = $startline->{$count} + 1;                              1+$env{'form.scantron.first_bubble_line.'.$count};
                         } else {  
                             $form{'scantron_questnum_start.'.$part} =  
                                 1+$env{'form.scantron.first_bubble_line.'.$count};  
                         }  
                         $count++;                          $count++;
                     }                      }
                 }                  }
Line 9100  sub grade_student_bubbles { Line 7916  sub grade_student_bubbles {
 }  }
   
 sub scantron_upload_scantron_data {  sub scantron_upload_scantron_data {
     my ($r,$symb) = @_;      my ($r)=@_;
     my $dom = $env{'request.role.domain'};      my $dom = $env{'request.role.domain'};
     my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($dom);  
     my $domdesc = &Apache::lonnet::domain($dom,'description');      my $domdesc = &Apache::lonnet::domain($dom,'description');
     $r->print(&Apache::loncommon::coursebrowser_javascript($dom));      $r->print(&Apache::loncommon::coursebrowser_javascript($dom));
     my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',      my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
   'domainid',    'domainid',
   'coursename',$dom);    'coursename',$dom);
     my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.      my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
                        ('&nbsp'x2).&mt('(shows course personnel)');                         ('&nbsp'x2).&mt('(shows course personnel)'); 
     my $default_form_data=&defaultFormData($symb);      my $default_form_data=&defaultFormData(&get_symb($r,1));
     my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');      my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
     &js_escape(\$nofile_alert);  
     my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");      my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");
     &js_escape(\$nocourseid_alert);  
     $r->print(&Apache::lonhtmlcommon::scripttag('      $r->print(&Apache::lonhtmlcommon::scripttag('
     function checkUpload(formname) {      function checkUpload(formname) {
  if (formname.upfile.value == "") {   if (formname.upfile.value == "") {
Line 9142  sub scantron_upload_scantron_data { Line 7955  sub scantron_upload_scantron_data {
         return;          return;
     }      }
   
     '.$formatjs.'  
 '));  '));
     $r->print('      $r->print('
 <h3>'.&mt('Send bubblesheet data to a course').'</h3>  <h3>'.&mt('Send scanned bubblesheet data to a course').'</h3>
   
 <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">  <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
 '.$default_form_data.  '.$default_form_data.
Line 9158  sub scantron_upload_scantron_data { Line 7970  sub scantron_upload_scantron_data {
   &Apache::lonhtmlcommon::row_closure().    &Apache::lonhtmlcommon::row_closure().
   &Apache::lonhtmlcommon::row_title(&mt('Domain')).    &Apache::lonhtmlcommon::row_title(&mt('Domain')).
   '<input name="domainid" type="hidden" />'.$domdesc.    '<input name="domainid" type="hidden" />'.$domdesc.
   &Apache::lonhtmlcommon::row_closure());    &Apache::lonhtmlcommon::row_closure().
     if ($formatoptions) {  
         $r->print(&Apache::lonhtmlcommon::row_title($formattitle).$formatoptions.  
                   &Apache::lonhtmlcommon::row_closure());  
     }  
     $r->print(  
   &Apache::lonhtmlcommon::row_title(&mt('File to upload')).    &Apache::lonhtmlcommon::row_title(&mt('File to upload')).
   '<input type="file" name="upfile" size="50" />'.    '<input type="file" name="upfile" size="50" />'.
   &Apache::lonhtmlcommon::row_closure(1).    &Apache::lonhtmlcommon::row_closure(1).
Line 9176  sub scantron_upload_scantron_data { Line 7983  sub scantron_upload_scantron_data {
     return '';      return '';
 }  }
   
 sub scantron_upload_dataformat {  
     my ($dom) = @_;  
     my ($formatoptions,$formattitle,$formatjs);  
     $formatjs = <<'END';  
 function toggleScantab(form) {  
    return;  
 }  
 END  
     my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$dom);  
     if (ref($domconfig{'scantron'}) eq 'HASH') {  
         if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {  
             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 (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 =~ /^#/);  
                                 $singleline = $line;  
                                 $count ++;  
                             }  
                             if ($count > 1) {  
                                 $formatextra = '<div style="display:none" id="bubbletype">'.  
                                                '<span class="LC_nobreak">'.  
                                                &mt('Bubblesheet type:').'&nbsp;'.  
                                                &scantron_scantab().'</span></div>';  
                                 $onclick = ' onclick="toggleScantab(this.form);"';  
                                 $formatjs = <<"END";  
 function toggleScantab(form) {  
     var divid = 'bubbletype';  
     if (document.getElementById(divid)) {  
         var radioname = 'fileformat';  
         var num = form.elements[radioname].length;  
         if (num) {  
             for (var i=0; i<num; i++) {  
                 if (form.elements[radioname][i].checked) {  
                     var chosen = form.elements[radioname][i].value;  
                     if (chosen == 'dat') {  
                         document.getElementById(divid).style.display = 'none';  
                     } else if (chosen == 'csv') {  
                         document.getElementById(divid).style.display = 'block';  
                     }  
                 }  
             }  
         }  
     }  
     return;  
 }  
   
 END  
                             } elsif ($count == 1) {  
                                 my $formatname = (split(/:/,$singleline,2))[0];  
                                 $formatextra = '<input type="hidden" name="scantron_format" value="'.$formatname.'" />';  
                             }  
                             $formattitle = &mt('File format');  
                             $formatoptions = '<label><input name="fileformat" type="radio" value="dat" checked="checked"'.$onclick.' />'.  
                                              &mt('Plain Text (no delimiters)').  
                                              '</label>'.('&nbsp;'x2).  
                                              '<label><input name="fileformat" type="radio" value="csv"'.$onclick.' />'.  
                                              &mt('Comma separated values').'</label>'.$formatextra;  
                         }  
                     }  
                 }  
             } elsif (keys(%{$domconfig{'scantron'}{'config'}}) == 1) {  
                 if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {  
                     if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {  
                         $formattitle = &mt('Bubblesheet type');  
                         $formatoptions = &scantron_scantab();  
                     }  
                 }  
             }  
         }  
     }  
     return ($formatoptions,$formattitle,$formatjs);  
 }  
   
 sub scantron_upload_scantron_data_save {  sub scantron_upload_scantron_data_save {
     my ($r,$symb) = @_;      my($r)=@_;
       my ($symb)=&get_symb($r,1);
     my $doanotherupload=      my $doanotherupload=
  '<br /><form action="/adm/grades" method="post">'."\n".   '<br /><form action="/adm/grades" method="post">'."\n".
  '<input type="hidden" name="command" value="scantronupload" />'."\n".   '<input type="hidden" name="command" value="scantronupload" />'."\n".
Line 9266  sub scantron_upload_scantron_data_save { Line 7996  sub scantron_upload_scantron_data_save {
  !&Apache::lonnet::allowed('usc',   !&Apache::lonnet::allowed('usc',
     $env{'form.domainid'}.'_'.$env{'form.courseid'})) {      $env{'form.domainid'}.'_'.$env{'form.courseid'})) {
  $r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");   $r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");
         unless ($symb) {   if ($symb) {
       $r->print(&show_grading_menu_form($symb));
    } else {
     $r->print($doanotherupload);      $r->print($doanotherupload);
  }   }
  return '';   return '';
     }      }
     my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});      my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
     my $uploadedfile;      my $uploadedfile;
     $r->print('<p>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</p>');      $r->print('<h3>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</h3>');
     if (length($env{'form.upfile'}) < 2) {      if (length($env{'form.upfile'}) < 2) {
         $r->print(          $r->print(&mt('[_1]Error:[_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.','<span class="LC_error">','</span>','<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));
             &Apache::lonhtmlcommon::confirm_success(  
                 &mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.',  
                         '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1));  
     } else {      } else {
         my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$env{'form.domainid'});          my $result = 
         my $parser;              &Apache::lonnet::userfileupload('upfile','','scantron','','','',
         if (ref($domconfig{'scantron'}) eq 'HASH') {  
             if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {  
                 my $is_csv;  
                 my @possibles = keys(%{$domconfig{'scantron'}{'config'}});  
                 if (@possibles > 1) {  
                     if ($env{'form.fileformat'} eq 'csv') {  
                         if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {  
                             if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {  
                                 if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) {  
                                     $is_csv = 1;  
                                 }  
                             }  
                         }  
                     }  
                 } elsif (@possibles == 1) {  
                     if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {  
                         if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {  
                             if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) {  
                                 $is_csv = 1;  
                             }  
                         }  
                     }  
                 }  
                 if ($is_csv) {  
                    $parser = $domconfig{'scantron'}{'config'}{'csv'};  
                 }  
             }  
         }  
         my $result =  
             &Apache::lonnet::userfileupload('upfile','scantron','scantron',$parser,'','',  
                                             $env{'form.courseid'},$env{'form.domainid'});                                              $env{'form.courseid'},$env{'form.domainid'});
  if ($result =~ m{^/uploaded/}) {   if ($result =~ m{^/uploaded/}) {
             $r->print(      $r->print(&mt('[_1]Success:[_2] Successfully uploaded [_3] bytes of data into location: [_4]',
                 &Apache::lonhtmlcommon::confirm_success(&mt('Upload successful')).'<br />'.                            '<span class="LC_success">','</span>',(length($env{'form.upfile'})-1),
                 &mt('Uploaded [_1] bytes of data into location: [_2]',    '<span class="LC_filename">'.$result.'</span>'));
                         (length($env{'form.upfile'})-1),  
                         '<span class="LC_filename">'.$result.'</span>'));  
             ($uploadedfile) = ($result =~ m{/([^/]+)$});              ($uploadedfile) = ($result =~ m{/([^/]+)$});
             $r->print(&validate_uploaded_scantron_file($env{'form.domainid'},              $r->print(&validate_uploaded_scantron_file($env{'form.domainid'},
                                                        $env{'form.courseid'},$uploadedfile));                                                         $env{'form.courseid'},$uploadedfile));
  } else {   } else {
             $r->print(      $r->print(&mt('[_1]Error:[_2] An error ([_3]) occurred when attempting to upload the file, [_4]',
                 &Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'<br />'.                            '<span class="LC_error">','</span>',$result,
                     &mt('An error ([_1]) occurred when attempting to upload the file: [_2]',  
                           $result,  
   '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));    '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));
  }   }
     }      }
     if ($symb) {      if ($symb) {
  $r->print(&scantron_selectphase($r,$uploadedfile,$symb));   $r->print(&scantron_selectphase($r,$uploadedfile));
     } else {      } else {
  $r->print($doanotherupload);   $r->print($doanotherupload);
     }      }
Line 9348  sub validate_uploaded_scantron_file { Line 8043  sub validate_uploaded_scantron_file {
     my $output;      my $output;
     if (@lines) {      if (@lines) {
         my (%counts,$max_match_format);          my (%counts,$max_match_format);
         my ($found_match_count,$max_match_count,$max_match_pct) = (0,0,0);          my ($max_match_count,$max_match_pct) = (0,0);
         my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname);          my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname);
         my %idmap = &username_to_idmap($classlist);          my %idmap = &username_to_idmap($classlist);
         foreach my $key (keys(%idmap)) {          foreach my $key (keys(%idmap)) {
Line 9356  sub validate_uploaded_scantron_file { Line 8051  sub validate_uploaded_scantron_file {
             $idmap{$lckey} = $idmap{$key};              $idmap{$lckey} = $idmap{$key};
         }          }
         my %unique_formats;          my %unique_formats;
         my @formatlines = &Apache::lonnet::get_scantronformat_file();          my @formatlines = &get_scantronformat_file();
         foreach my $line (@formatlines) {          foreach my $line (@formatlines) {
             chomp($line);              chomp($line);
             my @config = split(/:/,$line);              my @config = split(/:/,$line);
Line 9391  sub validate_uploaded_scantron_file { Line 8086  sub validate_uploaded_scantron_file {
                 if (($max_match_format eq '') || ($percent_match > $max_match_pct)) {                  if (($max_match_format eq '') || ($percent_match > $max_match_pct)) {
                     $max_match_pct = $percent_match;                      $max_match_pct = $percent_match;
                     $max_match_format = $key;                      $max_match_format = $key;
                     $found_match_count = $counts{$key}{'found'};  
                     $max_match_count = $counts{$key}{'total'};                      $max_match_count = $counts{$key}{'total'};
                 }                  }
             }              }
Line 9410  sub validate_uploaded_scantron_file { Line 8104  sub validate_uploaded_scantron_file {
                 }                  }
             }              }
             my $showpct = sprintf("%.0f",$max_match_pct).'%';              my $showpct = sprintf("%.0f",$max_match_pct).'%';
             $output .= '<br />';              $output .= '<br />'.&mt('Comparison of student IDs in the uploaded file with the course roster found matches for [_1] of the [_2] entries in the file (for the format defined for [_3]).','<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs).
             if ($found_match_count == $max_match_count) {                         '<br />'.&mt('A low percentage of matches results from one of the following:').'<ul>'.
                 # 100% matching entries                         '<li>'.&mt('The file was uploaded to the wrong course').'</li>'.
                 $output .= &Apache::lonhtmlcommon::confirm_success(                         '<li>'.&mt('The data are not in the format expected for the domain: [_1]',
                      &mt('Comparison of student IDs: [_1] matching ([quant,_2,entry,entries])',                                    '<i>'.$cdom.'</i>').'</li>'.
                             '<b>'.$showpct.'</b>',$found_match_count)).'<br />'.                         '<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'.
                 &mt('Comparison of student IDs in the uploaded file with'.                         '<li>'.&mt('The course roster is not up to date').'</li>'.
                     ' the course roster found matches for [_1] of the [_2] entries'.                         '</ul>';
                     ' in the file (for the format defined for [_3]).',  
                         '<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs);  
             } else {  
                 # Not all entries matching? -> Show warning and additional info  
                 $output .=  
                     &Apache::lonhtmlcommon::confirm_success(  
                         &mt('Comparison of student IDs: [_1] matching ([_2]/[quant,_3,entry,entries])',  
                                 '<b>'.$showpct.'</b>',$found_match_count,$max_match_count).'<br />'.  
                         &mt('Not all entries could be matched!'),1).'<br />'.  
                     &mt('Comparison of student IDs in the uploaded file with'.  
                         ' the course roster found matches for [_1] of the [_2] entries'.  
                         ' in the file (for the format defined for [_3]).',  
                             '<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs).  
                     '<p class="LC_info">'.  
                     &mt('A low percentage of matches results from one of the following:').  
                     '</p><ul>'.  
                     '<li>'.&mt('The file was uploaded to the wrong course.').'</li>'.  
                     '<li>'.&mt('The data is not in the format expected for the domain: [_1]',  
                                '<i>'.$cdom.'</i>').'</li>'.  
                     '<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'.  
                     '<li>'.&mt('The course roster is not up to date.').'</li>'.  
                     '</ul>';  
             }  
         }          }
     } else {      } else {
         $output = '<p class="LC_warning">'.&mt('Uploaded file contained no data').'</p>';          $output = '<span class="LC_warning">'.&mt('Uploaded file contained no data').'</span>';
     }      }
     return $output;      return $output;
 }  }
Line 9457  sub valid_file { Line 8128  sub valid_file {
 }  }
   
 sub scantron_download_scantron_data {  sub scantron_download_scantron_data {
     my ($r,$symb) = @_;      my ($r)=@_;
     my $default_form_data=&defaultFormData($symb);      my $default_form_data=&defaultFormData(&get_symb($r,1));
     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};      my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};      my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
     my $file=$env{'form.scantron_selectfile'};      my $file=$env{'form.scantron_selectfile'};
     if (! &valid_file($file)) {      if (! &valid_file($file)) {
  $r->print('   $r->print('
  <p>   <p>
     '.&mt('The requested filename was invalid.').'      '.&mt('The requested file name was invalid.').'
         </p>          </p>
 ');  ');
    $r->print(&show_grading_menu_form(&get_symb($r,1)));
  return;   return;
     }      }
     my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;      my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
Line 9478  sub scantron_download_scantron_data { Line 8150  sub scantron_download_scantron_data {
     &Apache::lonnet::allowuploaded('/adm/grades',$skipped);      &Apache::lonnet::allowuploaded('/adm/grades',$skipped);
     $r->print('      $r->print('
     <p>      <p>
  '.&mt('[_1]Original[_2] file as uploaded by the bubblesheet scanning office.',   '.&mt('[_1]Original[_2] file as uploaded by the scantron office.',
       '<a href="'.$orig.'">','</a>').'        '<a href="'.$orig.'">','</a>').'
     </p>      </p>
     <p>      <p>
Line 9490  sub scantron_download_scantron_data { Line 8162  sub scantron_download_scantron_data {
       '<a href="'.$skipped.'">','</a>').'        '<a href="'.$skipped.'">','</a>').'
     </p>      </p>
 ');  ');
       $r->print(&show_grading_menu_form(&get_symb($r,1)));
     return '';      return '';
 }  }
   
 sub checkscantron_results {  sub checkscantron_results {
     my ($r,$symb) = @_;      my ($r) = @_;
       my ($symb)=&get_symb($r);
     if (!$symb) {return '';}      if (!$symb) {return '';}
       my $grading_menu_button=&show_grading_menu_form($symb);
     my $cid = $env{'request.course.id'};      my $cid = $env{'request.course.id'};
     my %lettdig = &Apache::lonnet::letter_to_digits();      my %lettdig = &letter_to_digits();
     my $numletts = scalar(keys(%lettdig));      my $numletts = scalar(keys(%lettdig));
     my $cnum = $env{'course.'.$cid.'.num'};      my $cnum = $env{'course.'.$cid.'.num'};
     my $cdom = $env{'course.'.$cid.'.domain'};      my $cdom = $env{'course.'.$cid.'.domain'};
     my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'});      my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'});
     my %record;      my %record;
     my %scantron_config =      my %scantron_config =
         &Apache::lonnet::get_scantron_config($env{'form.scantron_format'});          &Apache::grades::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)=&Apache::grades::scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();      my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&Apache::grades::username_to_idmap($classlist);      my %idmap=&Apache::grades::username_to_idmap($classlist);
Line 9515  sub checkscantron_results { Line 8189  sub checkscantron_results {
         return '';          return '';
     }      }
     my $map=$navmap->getResourceByUrl($sequence);      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)) {  
         $randomorder=$map->randomorder();  
         $randompick=$map->randompick();  
     }  
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);      my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     my $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);      my (%grader_partids_by_symb,%grader_randomlists_by_symb);
     if ($nav_error) {      &graders_resources_pass(\@resources,\%grader_partids_by_symb,                             \%grader_randomlists_by_symb);
         $r->print(&navmap_errormsg());  
         return '';  
     }  
     &graders_resources_pass(\@resources,\%grader_partids_by_symb,  
                             \%grader_randomlists_by_symb,$bubbles_per_row);  
     my ($uname,$udom);      my ($uname,$udom);
     my (%scandata,%lastname,%bylast);      my (%scandata,%lastname,%bylast);
     $r->print('      $r->print('
Line 9537  sub checkscantron_results { Line 8201  sub checkscantron_results {
     my @delayqueue;      my @delayqueue;
     my %completedstudents;      my %completedstudents;
   
     my $count=&get_todo_count($scanlines,$scan_data);      my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status',
                                       'Progress of Bubblesheet Data/Submission Records Comparison',$count,
                                       'inline',undef,'checkscantron');
     my ($username,$domain,$started);      my ($username,$domain,$started);
     &scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.      my $nav_error;
       &scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
     if ($nav_error) {      if ($nav_error) {
         $r->print(&navmap_errormsg());          $r->print(&navmap_errormsg());
         return '';          return '';
Line 9564  sub checkscantron_results { Line 8231  sub checkscantron_results {
         my $scan_record=          my $scan_record=
             &Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config,              &Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config,
                                                      $scan_data);                                                       $scan_data);
         unless ($uname=&scantron_find_student($scan_record,$scan_data,          unless ($uname=&Apache::grades::scantron_find_student($scan_record,$scan_data,
                                               \%idmap,$i)) {                                                                \%idmap,$i)) {
             &Apache::grades::scantron_add_delay(\@delayqueue,$line,              &Apache::grades::scantron_add_delay(\@delayqueue,$line,
                                 'Unable to find a student that matches',1);                                  'Unable to find a student that matches',1);
             next;              next;
Line 9578  sub checkscantron_results { Line 8245  sub checkscantron_results {
         my $pid = $scan_record->{'scantron.ID'};          my $pid = $scan_record->{'scantron.ID'};
         $lastname{$pid} = $scan_record->{'scantron.LastName'};          $lastname{$pid} = $scan_record->{'scantron.LastName'};
         push(@{$bylast{$lastname{$pid}}},$pid);          push(@{$bylast{$lastname{$pid}}},$pid);
         my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION];  
         my $user = $uname.':'.$usec;  
         ($username,$domain)=split(/:/,$uname);  
   
         my $scancode;  
         if ((exists($scan_record->{'scantron.CODE'})) &&  
             (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {  
             $scancode = $scan_record->{'scantron.CODE'};  
         } else {  
             $scancode = '';  
         }  
   
         my @mapresources = @resources;  
         my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};          my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
         my %respnumlookup=();  
         my %startline=();  
         if ($randomorder || $randompick) {  
             @mapresources =  
                 &users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource,  
                              \%orderedforcode);  
             my $total = &get_respnum_lookups($sequence,$scan_data,\%idmap,$line,  
                                              $scan_record,\@master_seq,\%symb_to_resource,  
                                              \%grader_partids_by_symb,\%orderedforcode,  
                                              \%respnumlookup,\%startline);  
             if ($randompick && $total) {  
                 $lastpos = $total*$scantron_config{'Qlength'};  
             }  
         }  
         $scandata{$pid} = substr($line,$scantron_config{'Qstart'}-1,$lastpos);          $scandata{$pid} = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
         chomp($scandata{$pid});          chomp($scandata{$pid});
         $scandata{$pid} =~ s/\r$//;          $scandata{$pid} =~ s/\r$//;
           ($username,$domain)=split(/:/,$uname);
         my $counter = -1;          my $counter = -1;
         foreach my $resource (@mapresources) {          foreach my $resource (@resources) {
             my $parts;              my $parts;
             my $ressymb = $resource->symb();              my $ressymb = $resource->symb();
             if ((exists($grader_randomlists_by_symb{$ressymb})) ||              if ((exists($grader_randomlists_by_symb{$ressymb})) ||
                 (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {                  (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
                 my $currcode;  
                 if (exists($grader_randomlists_by_symb{$ressymb})) {  
                     $currcode = $scancode;  
                 }  
                 (my $analysis,$parts) =                  (my $analysis,$parts) =
                     &scantron_partids_tograde($resource,$env{'request.course.id'},                      &scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain);
                                               $username,$domain,undef,  
                                               $bubbles_per_row,$currcode);  
             } else {              } else {
                 $parts = $grader_partids_by_symb{$ressymb};                  $parts = $grader_partids_by_symb{$ressymb};
             }              }
             ($counter,my $recording) =              ($counter,my $recording) =
                 &verify_scantron_grading($resource,$domain,$username,$cid,$counter,                  &verify_scantron_grading($resource,$domain,$username,$cid,$counter,
                                          $scandata{$pid},$parts,                                           $scandata{$pid},$parts,
                                          \%scantron_config,\%lettdig,$numletts,                                           \%scantron_config,\%lettdig,$numletts);
                                          $randomorder,$randompick,  
                                          \%respnumlookup,\%startline);  
             $record{$pid} .= $recording;              $record{$pid} .= $recording;
         }          }
     }      }
Line 9655  sub checkscantron_results { Line 8287  sub checkscantron_results {
 '<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".  '<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
 '</tr>'."\n".  '</tr>'."\n".
 '<tr class="'.$css_class.'">'."\n".  '<tr class="'.$css_class.'">'."\n".
 '<td>'.&mt('Submissions').'</td><td>'.$showrecord.'</td></tr>'."\n";  '<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n";
                     $passed ++;                      $passed ++;
                 } else {                  } else {
                     my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';                      my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';
                     $badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".                      $badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
 '</tr>'."\n".  '</tr>'."\n".
 '<tr class="'.$css_class.'">'."\n".  '<tr class="'.$css_class.'">'."\n".
 '<td>'.&mt('Submissions').'</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".  '<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
 '</tr>'."\n";  '</tr>'."\n";
                     $failed ++;                      $failed ++;
                 }                  }
Line 9670  sub checkscantron_results { Line 8302  sub checkscantron_results {
             }              }
         }          }
     }      }
     $r->print('<p>'.      $r->print('<p>'.&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b>  ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>');
               &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).',      $r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>');
                   '<b>',  
                   $numstudents,  
                   '</b>',  
                   $env{'form.scantron_maxbubble'}).  
               '</p>'  
     );  
     $r->print('<p>'  
              .&mt('Exact matches for [_1][quant,_2,student][_3].','<b>',$passed,'</b>')  
              .'<br />'  
              .&mt('Discrepancies detected for [_1][quant,_2,student][_3].','<b>',$failed,'</b>')  
              .'</p>');  
     if ($passed) {      if ($passed) {
         $r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />');          $r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />');
         $r->print(&Apache::loncommon::start_data_table()."\n".          $r->print(&Apache::loncommon::start_data_table()."\n".
Line 9702  sub checkscantron_results { Line 8323  sub checkscantron_results {
                  &Apache::loncommon::end_data_table()).'<br />'.                   &Apache::loncommon::end_data_table()).'<br />'.
                  &mt('Differences can occur if submissions were modified using manual grading after a bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.');                     &mt('Differences can occur if submissions were modified using manual grading after a bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.');  
     }      }
     $r->print('</form><br />');      $r->print('</form><br />'.$grading_menu_button);
     return;      return;
 }  }
   
 sub verify_scantron_grading {  sub verify_scantron_grading {
     my ($resource,$domain,$username,$cid,$counter,$scandata,$partids,      my ($resource,$domain,$username,$cid,$counter,$scandata,$partids,
         $scantron_config,$lettdig,$numletts,$randomorder,$randompick,          $scantron_config,$lettdig,$numletts) = @_;
         $respnumlookup,$startline) = @_;  
     my ($record,%expected,%startpos);      my ($record,%expected,%startpos);
     return ($counter,$record) if (!ref($resource));      return ($counter,$record) if (!ref($resource));
     return ($counter,$record) if (!$resource->is_problem());      return ($counter,$record) if (!$resource->is_problem());
Line 9718  sub verify_scantron_grading { Line 8338  sub verify_scantron_grading {
     foreach my $part_id (@{$partids}) {      foreach my $part_id (@{$partids}) {
         $counter ++;          $counter ++;
         $expected{$part_id} = 0;          $expected{$part_id} = 0;
         my $respnum = $counter;          if ($env{"form.scantron.sub_bubblelines.$counter"}) {
         if ($randomorder || $randompick) {              my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$counter"});
             $respnum = $respnumlookup->{$counter};  
             $startpos{$part_id} = $startline->{$counter} + 1;  
         } else {  
             $startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"};  
         }  
         if ($env{"form.scantron.sub_bubblelines.$respnum"}) {  
             my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$respnum"});  
             foreach my $item (@sub_lines) {              foreach my $item (@sub_lines) {
                 $expected{$part_id} += $item;                  $expected{$part_id} += $item;
             }              }
         } else {          } else {
             $expected{$part_id} = $env{"form.scantron.bubblelines.$respnum"};              $expected{$part_id} = $env{"form.scantron.bubblelines.$counter"};
         }          }
           $startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"};
     }      }
     if ($symb) {      if ($symb) {
         my %recorded;          my %recorded;
Line 9828  sub verify_scantron_grading { Line 8442  sub verify_scantron_grading {
     return ($counter,$record);      return ($counter,$record);
 }  }
   
   sub letter_to_digits { 
       my %lettdig = (
                       A => 1,
                       B => 2,
                       C => 3,
                       D => 4,
                       E => 5,
                       F => 6,
                       G => 7,
                       H => 8,
                       I => 9,
                       J => 0,
                     );
       return %lettdig;
   }
   
   
 #-------- end of section for handling grading scantron forms -------  #-------- end of section for handling grading scantron forms -------
 #  #
 #-------------------------------------------------------------------  #-------------------------------------------------------------------
   
 #-------------------------- Menu interface -------------------------  #-------------------------- Menu interface -------------------------
 #  #
 #--- Href with symb and command ---  #--- Show a Grading Menu button - Calls the next routine ---
   sub show_grading_menu_form {
 sub href_symb_cmd {      my ($symb)=@_;
     my ($symb,$cmd)=@_;      my $result.='<br /><form action="/adm/grades" method="post">'."\n".
     return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&amp;command='.$cmd;   '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
    '<input type="hidden" name="saveState"  value="'.$env{'form.saveState'}.'" />'."\n".
    '<input type="hidden" name="command" value="gradingmenu" />'."\n".
    '<input type="submit" name="submit" value="'.&mt('Grading Menu').'" />'."\n".
    '</form>'."\n";
       return $result;
 }  }
   
 sub grading_menu {  sub grading_menu {
     my ($request,$symb) = @_;      my ($request) = @_;
       my ($symb)=&get_symb($request);
     if (!$symb) {return '';}      if (!$symb) {return '';}
       my $probTitle = &Apache::lonnet::gettitle($symb);
   
     my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),      my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
                   'command'=>'individual');                    'probTitle'=>$probTitle,
                     'command'=>'individual',
                     'gradingMenu'=>1,
                     'showgrading'=>"yes");
       
     my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);      my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
   
     $fields{'command'}='ungraded';      $fields{'command'}='ungraded';
Line 9859  sub grading_menu { Line 8500  sub grading_menu {
     $fields{'command'}='all_for_one';      $fields{'command'}='all_for_one';
     my $url1d=&Apache::lonhtmlcommon::build_url('grades/',\%fields);      my $url1d=&Apache::lonhtmlcommon::build_url('grades/',\%fields);
   
     $fields{'command'}='downloadfilesselect';  
     my $url1e=&Apache::lonhtmlcommon::build_url('grades/',\%fields);  
       
     $fields{'command'} = 'csvform';      $fields{'command'} = 'csvform';
     my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);      my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
           
Line 9876  sub grading_menu { Line 8514  sub grading_menu {
           
     my @menu = ({ categorytitle=>'Hand Grading',      my @menu = ({ categorytitle=>'Hand Grading',
             items =>[              items =>[
                         {       linktext => 'Select individual students to grade',                          { linktext => 'Select individual students to grade',
                                 url => $url1a,                      url => $url1a,
                                 permission => 'F',                      permission => 'F',
                                 icon => 'grade_students.png',                      icon => 'edit-find-replace.png',
                                 linktitle => 'Grade current resource for a selection of students.'                      linktitle => 'Grade current resource for a selection of students.'
                         },                          }, 
                         {       linktext => 'Grade ungraded submissions',                          {       linktext => 'Grade ungraded submissions.',
                                 url => $url1b,                                  url => $url1b,
                                 permission => 'F',                                  permission => 'F',
                                 icon => 'ungrade_sub.png',                                  icon => 'edit-find-replace.png',
                                 linktitle => 'Grade all submissions that have not been graded yet.'                                  linktitle => 'Grade all submissions that have not been graded yet.'
                         },                          },
   
                         {       linktext => 'Grading table',                          {       linktext => 'Grading table',
                                 url => $url1c,                                  url => $url1c,
                                 permission => 'F',                                  permission => 'F',
                                 icon => 'grading_table.png',                                  icon => 'edit-find-replace.png',
                                 linktitle => 'Grade current resource for all students.'                                  linktitle => 'Grade current resource for all students.'
                         },                          },
                         {       linktext => 'Grade page/folder for one student',                          {       linktext => 'Grade complete page/sequence/folder for one student',
                                 url => $url1d,                                  url => $url1d,
                                 permission => 'F',                                  permission => 'F',
                                 icon => 'grade_PageFolder.png',                                  icon => 'edit-find-replace.png',
                                 linktitle => 'Grade all resources in current page/sequence/folder for one student.'                                  linktitle => 'Grade all resources in current page/sequence/folder for one student.'
                         },  
                         {       linktext => 'Download submissions',  
                                 url => $url1e,  
                                 permission => 'F',  
                                 icon => 'download_sub.png',  
                                 linktitle => 'Download all students submissions.'  
                         }]},                          }]},
                          { categorytitle=>'Automated Grading',                           { categorytitle=>'Automated Grading',
                items =>[                 items =>[
Line 9925  sub grading_menu { Line 8557  sub grading_menu {
                    { linktext => 'Grade/Manage/Review Bubblesheets',                     { linktext => 'Grade/Manage/Review Bubblesheets',
                     url => $url4,                      url => $url4,
                     permission => 'F',                      permission => 'F',
                     icon => 'bubblesheet.png',                      icon => 'stat.png',
                     linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'                      linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'
                    },                     },
                             {   linktext => 'Verify Receipt Number',                              {   linktext => 'Verify Receipt No.',
                                 url => $url5,                                  url => $url5,
                                 permission => 'F',                                  permission => 'F',
                                 icon => 'receipt_number.png',                                  icon => 'edit-find-replace.png',
                                 linktitle => 'Verify a system-generated receipt number for correct problem solution.'                                  linktitle => 'Verify a system-generated receipt number for correct problem solution.'
                             }                              }
   
Line 9942  sub grading_menu { Line 8574  sub grading_menu {
     my $Str;      my $Str;
     $Str .= '<form method="post" action="" name="gradingMenu">';      $Str .= '<form method="post" action="" name="gradingMenu">';
     $Str .= '<input type="hidden" name="command" value="" />'.      $Str .= '<input type="hidden" name="command" value="" />'.
     '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";      '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
    '<input type="hidden" name="probTitle"   value="'.$probTitle.'" />'."\n".
    '<input type="hidden" name="gradingMenu" value="1" />'."\n".
    '<input type="hidden" name="showgrading" value="yes" />'."\n";
   
     $Str .= &Apache::lonhtmlcommon::generate_menu(@menu);      $Str .= &Apache::lonhtmlcommon::generate_menu(@menu);
     return $Str;          return $Str;    
 }  }
   
   
 sub ungraded {  sub ungraded {
     my ($request)=@_;      my ($request)=@_;
     &submit_options($request);      &submit_options($request);
 }  }
   
 sub submit_options_sequence {  sub submit_options_sequence {
     my ($request,$symb) = @_;      my ($request) = @_;
       my ($symb)=&get_symb($request);
     if (!$symb) {return '';}      if (!$symb) {return '';}
     &commonJSfunctions($request);      &commonJSfunctions($request);
     my $result;      my $result;
   
     $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".      $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
         '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";          '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
     $result.=&selectfield(0).          '<input type="hidden" name="gradingMenu" value="1" />'."\n".
           '<input type="hidden" name="showgrading" value="yes" />'."\n";
   
       $result.='
   <h2>
     '.&mt('Grade complete page/sequence/folder for one student').'
   </h2>'.
               &selectfield(0).
             '<input type="hidden" name="command" value="pickStudentPage" />              '<input type="hidden" name="command" value="pickStudentPage" />
             <div>              <div>
               <input type="submit" value="'.&mt('Next').' &rarr;" />                <input type="submit" value="'.&mt('Next').' &rarr;" />
             </div>              </div>
         </div>          </div>
   </form>';    </form>';
       $result .= &show_grading_menu_form($symb);
     return $result;      return $result;
 }  }
   
 sub submit_options_table {  sub submit_options_table {
     my ($request,$symb) = @_;      my ($request) = @_;
       my ($symb)=&get_symb($request);
     if (!$symb) {return '';}      if (!$symb) {return '';}
     &commonJSfunctions($request);      &commonJSfunctions($request);
     my $result;      my $result;
   
     $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".      $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
         '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";          '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
           '<input type="hidden" name="gradingMenu" value="1" />'."\n".
           '<input type="hidden" name="showgrading" value="yes" />'."\n";
   
     $result.=&selectfield(1).      $result.='
   <h2>
     '.&mt('Grading table').'
   </h2>'.
               &selectfield(0).
             '<input type="hidden" name="command" value="viewgrades" />              '<input type="hidden" name="command" value="viewgrades" />
             <div>              <div>
               <input type="submit" value="'.&mt('Next').' &rarr;" />                <input type="submit" value="'.&mt('Next').' &rarr;" />
             </div>              </div>
         </div>          </div>
   </form>';    </form>';
       $result .= &show_grading_menu_form($symb);
     return $result;      return $result;
 }  }
   
 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);  
         }  
     }  
   
     &commonJSfunctions($request);  
   
     my $result='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".  
         $table."\n".  
         '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";  
     $result.='  
 <h2>  
   '.&mt('Select Students for whom to Download Submissions').'  
 </h2>'.&selectfield(1).'  
                 <input type="hidden" name="command" value="downloadfileslink" />  
               <input type="submit" value="'.&mt('Next').' &rarr;" />  
             </div>  
           </div>  
   
   
   </form>';  
     return $result;  
 }  
   
 #--- Displays the submissions first page -------  #--- Displays the submissions first page -------
 sub submit_options {  sub submit_options {
     my ($request,$symb) = @_;      my ($request) = @_;
       my ($symb)=&get_symb($request);
     if (!$symb) {return '';}      if (!$symb) {return '';}
       my $probTitle = &Apache::lonnet::gettitle($symb);
   
     &commonJSfunctions($request);      &commonJSfunctions($request);
     my $result;      my $result;
   
     $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".      $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
  '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";   '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
     $result.=&selectfield(1).'   '<input type="hidden" name="probTitle"   value="'.$probTitle.'" />'."\n".
                 <input type="hidden" name="command" value="submission" />   '<input type="hidden" name="gradingMenu" value="1" />'."\n".
               <input type="submit" value="'.&mt('Next').' &rarr;" />   '<input type="hidden" name="showgrading" value="yes" />'."\n";
   
       $result.='
   <h2>
     '.&mt('Select individual students to grade').'
   </h2>'.&selectfield(1).'
                   <input type="hidden" name="command" value="submission" /> 
         <input type="submit" value="'.&mt('Next').' &rarr;" />
             </div>              </div>
           </div>            </div>
   
   
   </form>';    </form>';
       $result .= &show_grading_menu_form($symb);
     return $result;      return $result;
 }  }
   
 sub selectfield {  sub selectfield {
    my ($full)=@_;     my ($full)=@_;
    my %options =  
        (&substatus_options,  
         'select_form_order' => ['yes','queued','graded','incorrect','all']);  
    my $result='<div class="LC_columnSection">     my $result='<div class="LC_columnSection">
     
     <fieldset>      <fieldset>
       <legend>        <legend>
        '.&mt('Sections').'         '.&mt('Sections').'
       </legend>        </legend>
       '.&Apache::lonstatistics::SectionSelect('section','multiple',5).'        '.&Apache::lonstatistics::SectionSelect('section','multiple',5).'
     </fieldset>      </fieldset>
     
     <fieldset>      <fieldset>
       <legend>        <legend>
         '.&mt('Groups').'          '.&mt('Groups').'
       </legend>        </legend>
       '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'        '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
     </fieldset>      </fieldset>
      
     <fieldset>      <fieldset>
       <legend>        <legend>
         '.&mt('Access Status').'          '.&mt('Access Status').'
Line 10078  sub selectfield { Line 8701  sub selectfield {
       '.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'        '.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'
     </fieldset>';      </fieldset>';
     if ($full) {      if ($full) {
         $result.='         $result.='
     <fieldset>      <fieldset>
       <legend>        <legend>
         '.&mt('Submission Status').'          '.&mt('Submission Status').'
       </legend>'.        </legend>'.
        &Apache::loncommon::select_form('all','submitonly',\%options).         &Apache::loncommon::select_form('all','submitonly',
             (&Apache::lonlocal::texthash(
                'yes'       => 'with submissions',
                'queued'    => 'in grading queue',
                'graded'    => 'with ungraded submissions',
                'incorrect' => 'with incorrect submissions',
                'all'       => 'with any status'),
                'select_form_order' => ['yes','queued','graded','incorrect','all'])).
    '</fieldset>';     '</fieldset>';
     }      }
     $result.='</div><br />';      $result.='</div><br />';
     return $result;      return $result;
 }  }
   
 sub substatus_options {  
     return &Apache::lonlocal::texthash(  
                                       'yes'       => 'with submissions',  
                                       'queued'    => 'in grading queue',  
                                       'graded'    => 'with ungraded submissions',  
                                       'incorrect' => 'with incorrect submissions',  
                                       'all'       => 'with any status',  
                                       );  
 }  
   
 sub transtatus_options {  
     return &Apache::lonlocal::texthash(  
                                        'yes'       => 'with score transactions',  
                                        'incorrect' => 'with less than full credit',  
                                        'all'       => 'with any status',  
                                       );  
 }  
   
 sub reset_perm {  sub reset_perm {
     undef(%perm);      undef(%perm);
 }  }
Line 10130  sub init_perm { Line 8742  sub init_perm {
     }      }
 }  }
   
 sub init_old_essays {  
     my ($symb,$apath,$adom,$aname) = @_;  
     if ($symb ne '') {  
         my %essays = &Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);  
         if (keys(%essays) > 0) {  
             $old_essays{$symb} = \%essays;  
         }  
     }  
     return;  
 }  
   
 sub reset_old_essays {  
     undef(%old_essays);  
 }  
   
 sub gather_clicker_ids {  sub gather_clicker_ids {
     my %clicker_ids;      my %clicker_ids;
   
Line 10207  sub clicker_grading_parameters { Line 8804  sub clicker_grading_parameters {
 }  }
   
 sub process_clicker {  sub process_clicker {
     my ($r,$symb)=@_;      my ($r)=@_;
       my ($symb)=&get_symb($r);
     if (!$symb) {return '';}      if (!$symb) {return '';}
     my $result=&checkforfile_js();      my $result=&checkforfile_js();
     $result.=&Apache::loncommon::start_data_table().      $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
              &Apache::loncommon::start_data_table_header_row().      $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
              '<th>'.&mt('Specify a file containing clicker information and set grading options.').'</th>'.      $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
              &Apache::loncommon::end_data_table_header_row().      $result.='&nbsp;<b>'.&mt('Specify a file containing the clicker information for this resource.').
              &Apache::loncommon::start_data_table_row()."<td>\n";          '</b></td></tr>'."\n";
       $result.='<tr bgcolor="#ffffe6"><td>'."\n";
 # Attempt to restore parameters from last session, set defaults if not present  # Attempt to restore parameters from last session, set defaults if not present
     my %Saveable_Parameters=&clicker_grading_parameters();      my %Saveable_Parameters=&clicker_grading_parameters();
     &Apache::loncommon::restore_course_settings('grades_clicker',      &Apache::loncommon::restore_course_settings('grades_clicker',
Line 10231  sub process_clicker { Line 8830  sub process_clicker {
        }         }
     }      }
   
     my $upload=&mt("Evaluate File");      my $upload=&mt("Upload File");
     my $type=&mt("Type");      my $type=&mt("Type");
     my $attendance=&mt("Award points just for participation");      my $attendance=&mt("Award points just for participation");
     my $personnel=&mt("Correctness determined from response by course personnel");      my $personnel=&mt("Correctness determined from response by course personnel");
Line 10241  sub process_clicker { Line 8840  sub process_clicker {
     my $pcorrect=&mt("Percentage points for correct solution");      my $pcorrect=&mt("Percentage points for correct solution");
     my $pincorrect=&mt("Percentage points for incorrect solution");      my $pincorrect=&mt("Percentage points for incorrect solution");
     my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',      my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
                                                    {'iclicker' => 'i>clicker',     ('iclicker' => 'i>clicker',
                                                     'interwrite' => 'interwrite PRS',                                                      'interwrite' => 'interwrite PRS'));
                                                     'turning' => 'Turning Technologies'});  
     $symb = &Apache::lonenc::check_encrypt($symb);      $symb = &Apache::lonenc::check_encrypt($symb);
     $result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM);      $result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM);
 function sanitycheck() {  function sanitycheck() {
Line 10288  ENDUPFORM Line 8886  ENDUPFORM
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">  <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <input type="hidden" name="symb" value="$symb" />  <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="command" value="processclickerfile" />  <input type="hidden" name="command" value="processclickerfile" />
   <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
   <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 <input type="file" name="upfile" size="50" />  <input type="file" name="upfile" size="50" />
 <br /><label>$type: $selectform</label>  <br /><label>$type: $selectform</label>
 ENDUPFORM  <br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onclick="sanitycheck()" />$attendance </label>
     $result.='</td>'.&Apache::loncommon::end_data_table_row().  
                      &Apache::loncommon::start_data_table_row().'<td>'.(<<ENDGRADINGFORM);  
       <label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onclick="sanitycheck()" />$attendance </label>  
 <br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onclick="sanitycheck()" />$personnel</label>  <br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onclick="sanitycheck()" />$personnel</label>
 <br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onclick="sanitycheck()" />$specific </label>  <br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onclick="sanitycheck()" />$specific </label>
 <input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />  <input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
Line 10301  ENDUPFORM Line 8898  ENDUPFORM
 <br />&nbsp;&nbsp;&nbsp;  <br />&nbsp;&nbsp;&nbsp;
 <input type="text" name="givenanswer" size="50" />  <input type="text" name="givenanswer" size="50" />
 <input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />  <input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
 ENDGRADINGFORM  <br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onchange="sanitycheck()" /></label>
     $result.='</td>'.&Apache::loncommon::end_data_table_row().  
                      &Apache::loncommon::start_data_table_row().'<td>'.(<<ENDPERCFORM);  
       <label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onchange="sanitycheck()" /></label>  
 <br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onchange="sanitycheck()" /></label>  <br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onchange="sanitycheck()" /></label>
 <br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />  <br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
 </form>  </form>'
 ENDPERCFORM  ENDUPFORM
     $result.='</td>'.      $result.='</td></tr></table>'."\n".
              &Apache::loncommon::end_data_table_row().               '</td></tr></table><br /><br />'."\n";
              &Apache::loncommon::end_data_table();      $result.=&show_grading_menu_form($symb);
     return $result;      return $result;
 }  }
   
 sub process_clicker_file {  sub process_clicker_file {
     my ($r,$symb) = @_;      my ($r)=@_;
       my ($symb)=&get_symb($r);
     if (!$symb) {return '';}      if (!$symb) {return '';}
   
     my %Saveable_Parameters=&clicker_grading_parameters();      my %Saveable_Parameters=&clicker_grading_parameters();
     &Apache::loncommon::store_course_settings('grades_clicker',      &Apache::loncommon::store_course_settings('grades_clicker',
                                               \%Saveable_Parameters);                                                \%Saveable_Parameters);
     my $result='';      my $result='';
   #    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
     if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {      if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {
  $result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';   $result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';
  return $result;   return $result.&show_grading_menu_form($symb);
     }      }
     if (($env{'form.gradingmechanism'} eq 'given') && ($env{'form.givenanswer'}!~/\S/)) {      if (($env{'form.gradingmechanism'} eq 'given') && ($env{'form.givenanswer'}!~/\S/)) {
         $result.='<span class="LC_error">'.&mt('You need to specify the correct answer').'</span>';          $result.='<span class="LC_error">'.&mt('You need to specify the correct answer').'</span>';
         return $result;          return $result.&show_grading_menu_form($symb);
     }      }
     my $foundgiven=0;      my $foundgiven=0;
     if ($env{'form.gradingmechanism'} eq 'given') {      if ($env{'form.gradingmechanism'} eq 'given') {
         $env{'form.givenanswer'}=~s/^\s*//gs;          $env{'form.givenanswer'}=~s/^\s*//gs;
         $env{'form.givenanswer'}=~s/\s*$//gs;          $env{'form.givenanswer'}=~s/\s*$//gs;
         $env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-\+]+/\,/g;          $env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-]+/\,/g;
         $env{'form.givenanswer'}=uc($env{'form.givenanswer'});          $env{'form.givenanswer'}=uc($env{'form.givenanswer'});
         my @answers=split(/\,/,$env{'form.givenanswer'});          my @answers=split(/\,/,$env{'form.givenanswer'});
         $foundgiven=$#answers+1;          $foundgiven=$#answers+1;
Line 10374  sub process_clicker_file { Line 8970  sub process_clicker_file {
     $number++;      $number++;
  }   }
         $result.="</p>\n";          $result.="</p>\n";
         if ($number==0) {   if ($number==0) {
             $result .=      $result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>';
                  &Apache::lonhtmlcommon::confirm_success(      return $result.&show_grading_menu_form($symb);
                      &mt('No IDs found to determine correct answer'),1);   }
             return $result;  
         }  
     }      }
     if (length($env{'form.upfile'}) < 2) {      if (length($env{'form.upfile'}) < 2) {
         $result .=          $result.=&mt('[_1] Error: [_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.',
             &Apache::lonhtmlcommon::confirm_success(       '<span class="LC_error">',
                 &mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.',       '</span>',
                         '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1);       '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>');
         return $result;          return $result.&show_grading_menu_form($symb);
     }  
     my $mimetype;  
     if ($env{'form.upfiletype'} eq 'iclicker') {  
         my $mm = new File::MMagic;  
         $mimetype = $mm->checktype_contents($env{'form.upfile'});  
         unless (($mimetype eq 'text/plain') || ($mimetype eq 'text/html')) {  
             $result.= '<p>'.  
                 &Apache::lonhtmlcommon::confirm_success(  
                     &mt('File format is neither csv (iclicker 6) nor xml (iclicker 7)'),1).'</p>';  
             return $result;  
         }  
     } elsif (($env{'form.upfiletype'} ne 'interwrite') && ($env{'form.upfiletype'} ne 'turning')) {  
         $result .= '<p>'.  
             &Apache::lonhtmlcommon::confirm_success(  
                 &mt('Invalid clicker type: choose one of: i>clicker, Interwrite PRS, or Turning Technologies.'),1).'</p>';  
         return $result;  
     }      }
   
 # Were able to get all the info needed, now analyze the file  # Were able to get all the info needed, now analyze the file
   
     $result.=&Apache::loncommon::studentbrowser_javascript();      $result.=&Apache::loncommon::studentbrowser_javascript();
     $symb = &Apache::lonenc::check_encrypt($symb);      $symb = &Apache::lonenc::check_encrypt($symb);
     $result.=&Apache::loncommon::start_data_table().      my $heading=&mt('Scanning clicker file');
              &Apache::loncommon::start_data_table_header_row().      $result.=(<<ENDHEADER);
              '<th>'.&mt('Evaluate clicker file').'</th>'.  <br /><table width="100%" border="0"><tr><td bgcolor="#777777">
              &Apache::loncommon::end_data_table_header_row().  <table width="100%" border="0"><tr bgcolor="#e6ffff"><td>
              &Apache::loncommon::start_data_table_row().(<<ENDHEADER);  <b>$heading</b></td></tr><tr bgcolor=#ffffe6><td>
 <td>  
 <form method="post" action="/adm/grades" name="clickeranalysis">  <form method="post" action="/adm/grades" name="clickeranalysis">
 <input type="hidden" name="symb" value="$symb" />  <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="command" value="assignclickergrades" />  <input type="hidden" name="command" value="assignclickergrades" />
   <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
   <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 <input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" />  <input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" />
 <input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" />  <input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" />
 <input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" />  <input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" />
Line 10430  ENDHEADER Line 9009  ENDHEADER
     my $errormsg='';      my $errormsg='';
     my $number=0;      my $number=0;
     if ($env{'form.upfiletype'} eq 'iclicker') {      if ($env{'form.upfiletype'} eq 'iclicker') {
         if ($mimetype eq 'text/plain') {   ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);
             ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);      }
         } elsif ($mimetype eq 'text/html') {      if ($env{'form.upfiletype'} eq 'interwrite') {
             ($errormsg,$number)=&iclickerxml_eval(\@questiontitles,\%responses);  
         }  
     } elsif ($env{'form.upfiletype'} eq 'interwrite') {  
         ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);          ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);
     } elsif ($env{'form.upfiletype'} eq 'turning') {  
         ($errormsg,$number)=&turning_eval(\@questiontitles,\%responses);  
     }      }
     $result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.      $result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
              '<input type="hidden" name="number" value="'.$number.'" />'.               '<input type="hidden" name="number" value="'.$number.'" />'.
Line 10447  ENDHEADER Line 9021  ENDHEADER
              '<br />';               '<br />';
     if (($env{'form.gradingmechanism'} eq 'given') && ($number!=$foundgiven)) {      if (($env{'form.gradingmechanism'} eq 'given') && ($number!=$foundgiven)) {
        $result.='<span class="LC_error">'.&mt('Number of given answers does not agree with number of questions in file.').'</span>';         $result.='<span class="LC_error">'.&mt('Number of given answers does not agree with number of questions in file.').'</span>';
        return $result;         return $result.&show_grading_menu_form($symb);
     }       } 
 # Remember Question Titles  # Remember Question Titles
 # FIXME: Possibly need delimiter other than ":"  # FIXME: Possibly need delimiter other than ":"
Line 10467  ENDHEADER Line 9041  ENDHEADER
        } elsif ($clicker_ids{$id}) {         } elsif ($clicker_ids{$id}) {
           if ($clicker_ids{$id}=~/\,/) {            if ($clicker_ids{$id}=~/\,/) {
 # More than one user with the same clicker!  # More than one user with the same clicker!
              $result.="</td>".&Apache::loncommon::end_data_table_row().               $result.="\n<hr />".&mt('Clicker registered more than once').": <tt>".$id."</tt><br />";
                            &Apache::loncommon::start_data_table_row()."<td>".  
                        &mt('Clicker registered more than once').": <tt>".$id."</tt><br />";  
              $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.               $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.
                            "<select name='multi".$id."'>";                             "<select name='multi".$id."'>";
              foreach my $reguser (sort(split(/\,/,$clicker_ids{$id}))) {               foreach my $reguser (sort(split(/\,/,$clicker_ids{$id}))) {
Line 10483  ENDHEADER Line 9055  ENDHEADER
              $student_count++;               $student_count++;
           }            }
        } else {         } else {
           $result.="</td>".&Apache::loncommon::end_data_table_row().            $result.="\n<hr />".&mt('Unregistered Clicker')." <tt>".$id."</tt><br />";
                            &Apache::loncommon::start_data_table_row()."<td>".  
                     &mt('Unregistered Clicker')." <tt>".$id."</tt><br />";  
           $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.            $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.
                    "\n".&mt("Username").": <input type='text' name='uname".$id."' />&nbsp;".                     "\n".&mt("Username").": <input type='text' name='uname".$id."' />&nbsp;".
                    "\n".&mt("Domain").": ".                     "\n".&mt("Domain").": ".
                    &Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).'&nbsp;'.                     &Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).'&nbsp;'.
                    &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,'',$id);                     &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id);
           $unknown_count++;            $unknown_count++;
        }         }
     }      }
Line 10498  ENDHEADER Line 9068  ENDHEADER
              &mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count);               &mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count);
     if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) {      if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) {
        if ($correct_count==0) {         if ($correct_count==0) {
           $errormsg.="Found no correct answers for grading!";            $errormsg.="Found no correct answers answers for grading!";
        } elsif ($correct_count>1) {         } elsif ($correct_count>1) {
           $result.='<br /><span class="LC_warning">'.&mt("Found [_1] entries for grading!",$correct_count).'</span>';            $result.='<br /><span class="LC_warning">'.&mt("Found [_1] entries for grading!",$correct_count).'</span>';
        }         }
Line 10511  ENDHEADER Line 9081  ENDHEADER
     } else {      } else {
        $result.='<br /><input type="submit" name="finalize" value="'.&mt('Finalize Grading').'" />';         $result.='<br /><input type="submit" name="finalize" value="'.&mt('Finalize Grading').'" />';
     }      }
     $result.='</form></td>'.      $result.='</form></td></tr></table>'."\n".
              &Apache::loncommon::end_data_table_row().               '</td></tr></table><br /><br />'."\n";
              &Apache::loncommon::end_data_table();      return $result.&show_grading_menu_form($symb);
     return $result;  
 }  }
   
 sub iclicker_eval {  sub iclicker_eval {
Line 10536  sub iclicker_eval { Line 9105  sub iclicker_eval {
     $id=~s/^[\#0]+//;      $id=~s/^[\#0]+//;
     for (my $i=0;$i<$number;$i++) {      for (my $i=0;$i<$number;$i++) {
  my $idx=3+$i*6;   my $idx=3+$i*6;
                 $entries[$idx]=~s/[^a-zA-Z0-9\.\*\-\+]+//g;  
  push(@idresponses,$entries[$idx]);   push(@idresponses,$entries[$idx]);
     }      }
     $$responses{$id}=join(',',@idresponses);      $$responses{$id}=join(',',@idresponses);
Line 10545  sub iclicker_eval { Line 9113  sub iclicker_eval {
     return ($errormsg,$number);      return ($errormsg,$number);
 }  }
   
 sub iclickerxml_eval {  
     my ($questiontitles,$responses)=@_;  
     my $number=0;  
     my $errormsg='';  
     my @state;  
     my %respbyid;  
     my $p = HTML::Parser->new  
     (  
         xml_mode => 1,  
         start_h =>  
             [sub {  
                  my ($tagname,$attr) = @_;  
                  push(@state,$tagname);  
                  if ("@state" eq "ssn p") {  
                      my $title = $attr->{qn};  
                      $title =~ s/(^\s+|\s+$)//g;  
                      $questiontitles->[$number]=$title;  
                  } elsif ("@state" eq "ssn p v") {  
                      my $id = $attr->{id};  
                      my $entry = $attr->{ans};  
                      $id=~s/^[\#0]+//;  
                      $entry =~s/[^a-zA-Z0-9\.\*\-\+]+//g;  
                      $respbyid{$id}[$number] = $entry;  
                  }  
             }, "tagname, attr"],  
          end_h =>  
                [sub {  
                    my ($tagname) = @_;  
                    if ("@state" eq "ssn p") {  
                        $number++;  
                    }  
                    pop(@state);  
                 }, "tagname"],  
     );  
   
     $p->parse($env{'form.upfile'});  
     $p->eof;  
     foreach my $id (keys(%respbyid)) {  
         $responses->{$id}=join(',',@{$respbyid{$id}});  
     }  
     return ($errormsg,$number);  
 }  
   
 sub interwrite_eval {  sub interwrite_eval {
     my ($questiontitles,$responses)=@_;      my ($questiontitles,$responses)=@_;
     my $number=0;      my $number=0;
Line 10619  sub interwrite_eval { Line 9144  sub interwrite_eval {
     return ($errormsg,$number);      return ($errormsg,$number);
 }  }
   
 sub turning_eval {  
     my ($questiontitles,$responses)=@_;  
     my $number=0;  
     my $errormsg='';  
     foreach my $line (split(/[\n\r]/,$env{'form.upfile'})) {  
         my %components=&Apache::loncommon::record_sep($line);  
         my @entries=map {$components{$_}} (sort(keys(%components)));  
         if ($#entries>$number) { $number=$#entries; }  
         my $id=$entries[0];  
         my @idresponses;  
         $id=~s/^[\#0]+//;  
         unless ($id) { next; }  
         for (my $idx=1;$idx<=$#entries;$idx++) {  
             $entries[$idx]=~s/\,/\;/g;  
             $entries[$idx]=~s/[^a-zA-Z0-9\.\*\-\+\;]+//g;  
             push(@idresponses,$entries[$idx]);  
         }  
         $$responses{$id}=join(',',@idresponses);  
     }  
     for (my $i=1; $i<=$number; $i++) {  
         $$questiontitles[$i]=&mt('Question [_1]',$i);  
     }  
     return ($errormsg,$number);  
 }  
   
 sub assign_clicker_grades {  sub assign_clicker_grades {
     my ($r,$symb) = @_;      my ($r)=@_;
       my ($symb)=&get_symb($r);
     if (!$symb) {return '';}      if (!$symb) {return '';}
 # See which part we are saving to  # See which part we are saving to
     my $res_error;      my $res_error;
Line 10656  sub assign_clicker_grades { Line 9157  sub assign_clicker_grades {
 # FIXME: This should probably look for the first handgradeable part  # FIXME: This should probably look for the first handgradeable part
     my $part=$$partlist[0];      my $part=$$partlist[0];
 # Start screen output  # Start screen output
     my $result = &Apache::loncommon::start_data_table().       my $result='';
                  &Apache::loncommon::start_data_table_header_row().  #    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
                  '<th>'.&mt('Assigning grades based on clicker file').'</th>'.  
                  &Apache::loncommon::end_data_table_header_row().      my $heading=&mt('Assigning grades based on clicker file');
                  &Apache::loncommon::start_data_table_row().'<td>';      $result.=(<<ENDHEADER);
   <br /><table width="100%" border="0"><tr><td bgcolor="#777777">
   <table width="100%" border="0"><tr bgcolor="#e6ffff"><td>
   <b>$heading</b></td></tr><tr bgcolor=#ffffe6><td>
   ENDHEADER
 # Get correct result  # Get correct result
 # FIXME: Possibly need delimiter other than ":"  # FIXME: Possibly need delimiter other than ":"
     my @correct=();      my @correct=();
Line 10676  sub assign_clicker_grades { Line 9181  sub assign_clicker_grades {
                     $result.='<br /><span class="LC_warning">'.                      $result.='<br /><span class="LC_warning">'.
                              &mt('More than one correct result given for question "[_1]": [_2] versus [_3].',                               &mt('More than one correct result given for question "[_1]": [_2] versus [_3].',
                                  $env{'form.question:'.$i},$correct[$i],$input[$i]).'</span>';                                   $env{'form.question:'.$i},$correct[$i],$input[$i]).'</span>';
                  } elsif (($input[$i]) || ($input[$i] eq '0')) {                   } elsif ($input[$i]) {
                     $correct[$i]=$input[$i];                      $correct[$i]=$input[$i];
                  }                   }
              }               }
           }            }
        }         }
        for (my $i=0;$i<$number;$i++) {         for (my $i=0;$i<$number;$i++) {
           if ((!$correct[$i]) && ($correct[$i] ne '0')) {            if (!$correct[$i]) {
              $result.='<br /><span class="LC_error">'.               $result.='<br /><span class="LC_error">'.
                       &mt('No correct result given for question "[_1]"!',                        &mt('No correct result given for question "[_1]"!',
                           $env{'form.question:'.$i}).'</span>';                            $env{'form.question:'.$i}).'</span>';
           }            }
        }         }
        $result.='<br />'.&mt("Correct answer: [_1]",join(', ',map { ((($_) || ($_ eq '0'))?$_:'-') } @correct));         $result.='<br />'.&mt("Correct answer: [_1]",join(', ',map { ($_?$_:'-') } @correct));
     }      }
 # Start grading  # Start grading
     my $pcorrect=$env{'form.pcorrect'};      my $pcorrect=$env{'form.pcorrect'};
     my $pincorrect=$env{'form.pincorrect'};      my $pincorrect=$env{'form.pincorrect'};
     my $storecount=0;      my $storecount=0;
     my %users=();  
     foreach my $key (keys(%env)) {      foreach my $key (keys(%env)) {
        my $user='';         my $user='';
        if ($key=~/^form\.student\:(.*)$/) {         if ($key=~/^form\.student\:(.*)$/) {
Line 10709  sub assign_clicker_grades { Line 9213  sub assign_clicker_grades {
              $user=$env{'form.multi'.$id};               $user=$env{'form.multi'.$id};
           }            }
        }         }
        if ($user) {         if ($user) { 
           if ($users{$user}) {  
              $result.='<br /><span class="LC_warning">'.  
                       &mt('More than one entry found for [_1]!','<tt>'.$user.'</tt>').  
                       '</span><br />';  
           }  
           $users{$user}=1;  
           my @answer=split(/\,/,$env{$key});            my @answer=split(/\,/,$env{$key});
           my $sum=0;            my $sum=0;
           my $realnumber=$number;            my $realnumber=$number;
           for (my $i=0;$i<$number;$i++) {            for (my $i=0;$i<$number;$i++) {
              if  ($correct[$i] eq '-') {               if  ($correct[$i] eq '-') {
                 $realnumber--;                  $realnumber--;
              } elsif (($answer[$i]) || ($answer[$i]=~/^[0\.]+$/)) {               } elsif ($answer[$i]) {
                 if ($gradingmechanism eq 'attendance') {                  if ($gradingmechanism eq 'attendance') {
                    $sum+=$pcorrect;                     $sum+=$pcorrect;
                 } elsif ($correct[$i] eq '*') {                  } elsif ($correct[$i] eq '*') {
                    $sum+=$pcorrect;                     $sum+=$pcorrect;
                 } else {                  } else {
 # We actually grade if correct or not                     if ($answer[$i] eq $correct[$i]) {
                    my $increment=$pincorrect;                        $sum+=$pcorrect;
 # Special case: numerical answer "0"                     } else {
                    if ($correct[$i] eq '0') {                        $sum+=$pincorrect;
                       if ($answer[$i]=~/^[0\.]+$/) {  
                          $increment=$pcorrect;  
                       }  
 # General numerical answer, both evaluate to something non-zero  
                    } elsif ((1.0*$correct[$i]!=0) && (1.0*$answer[$i]!=0)) {  
                       if (1.0*$correct[$i]==1.0*$answer[$i]) {  
                          $increment=$pcorrect;  
                       }  
 # Must be just alphanumeric  
                    } elsif ($answer[$i] eq $correct[$i]) {  
                       $increment=$pcorrect;  
                    }                     }
                    $sum+=$increment;  
                 }                  }
              }               }
           }            }
Line 10767  sub assign_clicker_grades { Line 9253  sub assign_clicker_grades {
     }      }
 # We are done  # We are done
     $result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).      $result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).
              '</td>'.               '</td></tr></table>'."\n".
              &Apache::loncommon::end_data_table_row().               '</td></tr></table><br /><br />'."\n";
              &Apache::loncommon::end_data_table();      return $result.&show_grading_menu_form($symb);
     return $result;  
 }  }
   
 sub navmap_errormsg {  sub navmap_errormsg {
Line 10780  sub navmap_errormsg { Line 9265  sub navmap_errormsg {
            '</div>';             '</div>';
 }  }
   
 sub startpage {  
     my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js,$onload,$divforres) = @_;  
     my %args;  
     if ($onload) {  
          my %loaditems = (  
                         'onload' => $onload,  
                       );  
          $args{'add_entries'} = \%loaditems;  
     }  
     if ($nomenu) {  
         $args{'only_body'} = 1;  
         $r->print(&Apache::loncommon::start_page("Student's Version",$js,\%args));  
     } else {  
         unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});  
         $args{'bread_crumbs'} = $crumbs;  
         $r->print(&Apache::loncommon::start_page('Grading',$js,\%args));  
     }  
     unless ($nodisplayflag) {  
        $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres));  
     }  
 }  
   
 sub select_problem {  
     my ($r)=@_;  
     $r->print('<h3>'.&mt('Select the problem or one of the problems you want to grade').'</h3><form action="/adm/grades">');  
     $r->print(&Apache::lonstathelpers::problem_selector('.',undef,1,undef,undef,1));  
     $r->print('<input type="hidden" name="command" value="gradingmenu" />');  
     $r->print('<input type="submit" value="'.&mt('Next').' &rarr;" /></form>');  
 }  
   
 sub handler {  sub handler {
     my $request=$_[0];      my $request=$_[0];
     &reset_caches();      &reset_caches();
     if ($request->header_only) {      if ($env{'browser.mathml'}) {
         &Apache::loncommon::content_type($request,'text/html');   &Apache::loncommon::content_type($request,'text/xml');
         $request->send_http_header;      } else {
         return OK;   &Apache::loncommon::content_type($request,'text/html');
     }      }
       $request->send_http_header;
       return '' if $request->header_only;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
       my $symb=&get_symb($request,1);
 # see what command we need to execute  
    
     my @commands=&Apache::loncommon::get_env_multiple('form.command');      my @commands=&Apache::loncommon::get_env_multiple('form.command');
     my $command=$commands[0];      my $command=$commands[0];
   
     &init_perm();  
     if (!$env{'request.course.id'}) {  
         unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) &&  
                 ($command =~ /^scantronupload/)) {  
             # Not in a course.  
             $env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";  
             return HTTP_NOT_ACCEPTABLE;  
         }  
     } elsif (!%perm) {  
         $request->internal_redirect('/adm/quickgrades');  
         return OK;  
     }  
     &Apache::loncommon::content_type($request,'text/html');  
     $request->send_http_header;  
   
     if ($#commands > 0) {      if ($#commands > 0) {
  &Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));   &Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
     }      }
   
 # see what the symb is  
   
     my $symb=$env{'form.symb'};  
     unless ($symb) {  
        (my $url=$env{'form.url'}) =~ s-^https*://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;  
        $symb=&Apache::lonnet::symbread($url);  
     }  
     &Apache::lonenc::check_decrypt(\$symb);  
   
     $ssi_error = 0;      $ssi_error = 0;
     if (($symb eq '' || $command eq '') && ($env{'request.course.id'})) {      my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];
 #      $request->print(&Apache::loncommon::start_page('Grading',undef,
 # Not called from a resource, but inside a course                                            {'bread_crumbs' => $brcrum}));
       if ($symb eq '' && $command eq '') {
 #  #
         &startpage($request,undef,[],1,1);  # Not called from a resource
         &select_problem($request);  #    
   
     } else {      } else {
         if ($command eq 'submission' && $perm{'vgr'}) {   &init_perm();
             my ($stuvcurrent,$stuvdisp,$versionform,$js,$onload);   if ($command eq 'submission' && $perm{'vgr'}) {
             if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) {      ($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
                 ($stuvcurrent,$stuvdisp,$versionform,$js) =   } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
                     &choose_task_version_form($symb,$env{'form.student'},      &pickStudentPage($request);
                                               $env{'form.userdom'});   } elsif ($command eq 'displayPage' && $perm{'vgr'}) {
             }      &displayPage($request);
             my $divforres;   } elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
             if ($env{'form.student'} eq '') {      &updateGradeByPage($request);
                 $js .= &part_selector_js();   } elsif ($command eq 'processGroup' && $perm{'vgr'}) {
                 $onload = "toggleParts('gradesub');";      &processGroup($request);
             } else {   } elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
                 $divforres = 1;      $request->print(&grading_menu($request));
             }   } elsif ($command eq 'individual' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,$stuvcurrent,$stuvdisp,undef,$js,$onload,$divforres);      $request->print(&submit_options($request));
             if ($versionform) {  
                 if ($divforres) {  
                     $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');  
                 }  
                 $request->print($versionform);  
             }  
             ($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);  
             if ($versionform) {  
                 $request->print($versionform);  
             }  
             $request->print('<br clear="all" />');  
             $request->print(&show_previous_task_version($request,$symb));  
         } 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'}) {  
             &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);  
             &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'}) {  
             &startpage($request,$symb,[{href=>'',text=>'...'},  
                                        {href=>'',text=>'Modify grades'}],undef,undef,undef,undef,undef,undef,undef,1);  
             &processGroup($request,$symb);  
         } elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {  
             &startpage($request,$symb);  
             $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));  
         } elsif ($command eq 'ungraded' && $perm{'vgr'}) {          } elsif ($command eq 'ungraded' && $perm{'vgr'}) {
             my $js = &part_selector_js();              $request->print(&submit_options($request));
             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'}) {          } elsif ($command eq 'table' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>"", text=>"Grading table"}]);              $request->print(&submit_options_table($request));
             $request->print(&submit_options_table($request,$symb));  
         } elsif ($command eq 'all_for_one' && $perm{'vgr'}) {          } 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));
             $request->print(&submit_options_sequence($request,$symb));   } elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
         } elsif ($command eq 'viewgrades' && $perm{'vgr'}) {      $request->print(&viewgrades($request));
             &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},{href=>'', text=>"Modify grades"}]);   } elsif ($command eq 'handgrade' && $perm{'mgr'}) {
             $request->print(&viewgrades($request,$symb));      $request->print(&processHandGrade($request));
         } elsif ($command eq 'handgrade' && $perm{'mgr'}) {   } elsif ($command eq 'editgrades' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>'',text=>'...'},      $request->print(&editgrades($request));
                                        {href=>'',text=>'Store grades'}]);  
             $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&section=all&Status=Active',  
                                                                              text=>"Modify grades"},  
                                        {href=>'', text=>"Store grades"}]);  
             $request->print(&editgrades($request,$symb));  
         } elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {          } elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>'',text=>'Verify Receipt Number'}]);              $request->print(&initialverifyreceipt($request));
             $request->print(&initialverifyreceipt($request,$symb));   } elsif ($command eq 'verify' && $perm{'vgr'}) {
         } elsif ($command eq 'verify' && $perm{'vgr'}) {      $request->print(&verifyreceipt($request));
             &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"initialverifyreceipt"),text=>'Verify Receipt Number'},  
                                        {href=>'',text=>'Verification Result'}]);  
             $request->print(&verifyreceipt($request,$symb));  
         } elsif ($command eq 'processclicker' && $perm{'mgr'}) {          } elsif ($command eq 'processclicker' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>'', text=>'Process clicker'}]);              $request->print(&process_clicker($request));
             $request->print(&process_clicker($request,$symb));  
         } elsif ($command eq 'processclickerfile' && $perm{'mgr'}) {          } elsif ($command eq 'processclickerfile' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'processclicker'), text=>'Process clicker'},              $request->print(&process_clicker_file($request));
                                        {href=>'', text=>'Process clicker file'}]);  
             $request->print(&process_clicker_file($request,$symb));  
         } elsif ($command eq 'assignclickergrades' && $perm{'mgr'}) {          } elsif ($command eq 'assignclickergrades' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'processclicker'), text=>'Process clicker'},              $request->print(&assign_clicker_grades($request));
                                        {href=>'', text=>'Process clicker file'},   } elsif ($command eq 'csvform' && $perm{'mgr'}) {
                                        {href=>'', text=>'Store grades'}]);      $request->print(&upcsvScores_form($request));
             $request->print(&assign_clicker_grades($request,$symb));   } elsif ($command eq 'csvupload' && $perm{'mgr'}) {
         } elsif ($command eq 'csvform' && $perm{'mgr'}) {      $request->print(&csvupload($request));
             &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);   } elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
             $request->print(&upcsvScores_form($request,$symb));      $request->print(&csvuploadmap($request));
         } elsif ($command eq 'csvupload' && $perm{'mgr'}) {   } elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);      if ($env{'form.associate'} ne 'Reverse Association') {
             $request->print(&csvupload($request,$symb));   $request->print(&csvuploadoptions($request));
         } elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {      } else {
             &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);   if ( $env{'form.upfile_associate'} ne 'reverse' ) {
             $request->print(&csvuploadmap($request,$symb));      $env{'form.upfile_associate'} = 'reverse';
         } elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {   } else {
             if ($env{'form.associate'} ne 'Reverse Association') {      $env{'form.upfile_associate'} = 'forward';
                 &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);   }
                 $request->print(&csvuploadoptions($request,$symb));   $request->print(&csvuploadmap($request));
             } else {      }
                 if ( $env{'form.upfile_associate'} ne 'reverse' ) {   } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
                     $env{'form.upfile_associate'} = 'reverse';      $request->print(&csvuploadassign($request));
                 } else {   } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
                     $env{'form.upfile_associate'} = 'forward';      $request->print(&scantron_selectphase($request));
                 }    } elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
                 &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);       $request->print(&scantron_do_warning($request));
                 $request->print(&csvuploadmap($request,$symb));   } elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
             }      $request->print(&scantron_validate_file($request));
         } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {   } elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);      $request->print(&scantron_process_students($request));
             $request->print(&csvuploadassign($request,$symb));    } elsif ($command eq 'scantronupload' && 
         } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {    (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1,    &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
                        undef,undef,undef,undef,'toggleScantab(document.rules);');       $request->print(&scantron_upload_scantron_data($request)); 
             $request->print(&scantron_selectphase($request,undef,$symb));    } elsif ($command eq 'scantronupload_save' &&
         } elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {    (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);    &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
             $request->print(&scantron_do_warning($request,$symb));       $request->print(&scantron_upload_scantron_data_save($request));
         } elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {    } elsif ($command eq 'scantron_download' &&
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);   &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
             $request->print(&scantron_validate_file($request,$symb));       $request->print(&scantron_download_scantron_data($request));
         } 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'}))) {  
             &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'}))) {  
             &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'})) {  
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);  
             $request->print(&scantron_download_scantron_data($request,$symb));  
         } elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {          } elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);              $request->print(&checkscantron_results($request));     
             $request->print(&checkscantron_results($request,$symb));   } elsif ($command) {
         } elsif ($command eq 'downloadfilesselect' && $perm{'vgr'}) {      $request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');
             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'}],  
                undef,undef,undef,undef,undef,undef,undef,1);  
             $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');  
             &submit_download_link($request,$symb);  
         } elsif ($command) {  
             &startpage($request,$symb,[{href=>'', text=>'Access denied'}]);  
             $request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');  
         }  
     }      }
     if ($ssi_error) {      if ($ssi_error) {
  &ssi_print_error($request);   &ssi_print_error($request);
     }      }
     $request->print(&Apache::loncommon::end_page());      $request->print(&Apache::loncommon::end_page());
     &reset_caches();      &reset_caches();
     return OK;      return '';
 }  }
   
 1;  1;
Line 11076  At least the logic that drives this has Line 9413  At least the logic that drives this has
 ssi_with_retries - Does the server side include of a resource.  ssi_with_retries - Does the server side include of a resource.
                      if the ssi call returns an error we'll retry it up to                       if the ssi call returns an error we'll retry it up to
                      the number of times requested by the caller.                       the number of times requested by the caller.
                      If we still have a problem, no text is appended to the                       If we still have a proble, no text is appended to the
                      output and we set some global variables.                       output and we set some global variables.
                      to indicate to the caller an SSI error occurred.                         to indicate to the caller an SSI error occurred.  
                      All of this is supposed to deal with the issues described                       All of this is supposed to deal with the issues described
                      in LON-CAPA BZ 5631 see:                       in LonCAPA BZ 5631 see:
                      http://bugs.lon-capa.org/show_bug.cgi?id=5631                       http://bugs.lon-capa.org/show_bug.cgi?id=5631
                      by informing the user that this happened.                       by informing the user that this happened.
   
Line 11121  ssi_with_retries() Line 9458  ssi_with_retries()
     $r           - Apache request object      $r           - Apache request object
     $i           - number of the current scanline      $i           - number of the current scanline
     $scan_record - hash ref as returned from &scantron_parse_scanline()      $scan_record - hash ref as returned from &scantron_parse_scanline()
     $scan_config - hash ref as returned from &Apache::lonnet::get_scantron_config()      $scan_config - hash ref as returned from &get_scantron_config()
     $line        - full contents of the current scanline      $line        - full contents of the current scanline
     $error       - error condition, valid values are      $error       - error condition, valid values are
                    'incorrectCODE', 'duplicateCODE',                     'incorrectCODE', 'duplicateCODE',
Line 11138  ssi_with_retries() Line 9475  ssi_with_retries()
          - missingbubble - array ref of the bubble lines that have missing           - missingbubble - array ref of the bubble lines that have missing
                            bubble errors                             bubble errors
   
    $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).  
    $startline   - Reference to hash where key is question number (0 is first)  
                   and value is number of first bubble line for current student  
                   or code-based randompick and/or randomorder.  
   
   
 =item  scantron_get_maxbubble() :   =item  scantron_get_maxbubble() : 
   
    Arguments:     Arguments:
Line 11157  ssi_with_retries() Line 9484  ssi_with_retries()
        calling routine should trap the error condition and display the warning         calling routine should trap the error condition and display the warning
        found in &navmap_errormsg().         found in &navmap_errormsg().
   
        $scantron_config - Reference to bubblesheet format configuration hash.  
   
    Returns the maximum number of bubble lines that are expected to     Returns the maximum number of bubble lines that are expected to
    occur. Does this by walking the selected sequence rendering the     occur. Does this by walking the selected sequence rendering the
    resource and then checking &Apache::lonxml::get_problem_counter()     resource and then checking &Apache::lonxml::get_problem_counter()
Line 11168  ssi_with_retries() Line 9493  ssi_with_retries()
    $env{'form.scantron.bubble_lines.n'},      $env{'form.scantron.bubble_lines.n'}, 
    $env{'form.scantron.first_bubble_line.n'} and     $env{'form.scantron.first_bubble_line.n'} and
    $env{"form.scantron.sub_bubblelines.n"}     $env{"form.scantron.sub_bubblelines.n"}
    which are the total number of bubble lines, the number of bubble     which are the total number of bubble, lines, the number of bubble
    lines for response n and number of the first bubble line for response n,     lines for response n and number of the first bubble line for response n,
    and a comma separated list of numbers of bubble lines for sub-questions     and a comma separated list of numbers of bubble lines for sub-questions
    (for optionresponse, matchresponse, and rankresponse items), for response n.       (for optionresponse, matchresponse, and rankresponse items), for response n.  
Line 11182  ssi_with_retries() Line 9507  ssi_with_retries()
   
 =item  scantron_process_students() :   =item  scantron_process_students() : 
   
    Routine that does the actual grading of the bubblesheet information.     Routine that does the actual grading of the bubble sheet information.
   
    The parsed scanline hash is added to %env      The parsed scanline hash is added to %env 
   
Line 11202  ssi_with_retries() Line 9527  ssi_with_retries()
   
 =item  scantron_upload_scantron_data() :  =item  scantron_upload_scantron_data() :
   
     Creates the screen for adding a new bubblesheet data file to a course.      Creates the screen for adding a new bubble sheet data file to a course.
   
 =item  scantron_upload_scantron_data_save() :   =item  scantron_upload_scantron_data_save() : 
   
Line 11216  ssi_with_retries() Line 9541  ssi_with_retries()
 =item  scantron_download_scantron_data() :   =item  scantron_download_scantron_data() : 
   
    Shows a list of the three internal files (original, corrected,     Shows a list of the three internal files (original, corrected,
    skipped) for a specific bubblesheet data file that exists in the     skipped) for a specific bubble sheet data file that exists in the
    course.     course.
   
 =item  scantron_validate_ID() :   =item  scantron_validate_ID() : 

Removed from v.1.596.2.12.2.52  
changed lines
  Added in v.1.604


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>