Diff for /loncom/homework/grades.pm between versions 1.596.2.12.2.41.2.4 and 1.596.2.13

version 1.596.2.12.2.41.2.4, 2019/02/05 16:13:05 version 1.596.2.13, 2012/08/09 23:25:48
Line 125  sub getpartlist { Line 125  sub getpartlist {
 # --- Get the symbolic name of a problem and the url  # --- Get the symbolic name of a problem and the url
 sub get_symb {  sub get_symb {
     my ($request,$silent) = @_;      my ($request,$silent) = @_;
     my $symb=$env{'form.symb'};      (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
     unless ($symb) {      my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
         (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;      if ($symb eq '') { 
         $symb = &Apache::lonnet::symbread($url);   if (!$silent) {
         if ($symb eq '') {               $request->print(&mt("Unable to handle ambiguous references: [_1].",$url));
     if (!$silent) {      return ();
                 $request->print(&mt("Unable to handle ambiguous references: [_1].",$url));   }
         return ();  
     }  
         }  
     }      }
     &Apache::lonenc::check_decrypt(\$symb);      &Apache::lonenc::check_decrypt(\$symb);
     return ($symb);      return ($symb);
Line 253  sub showResourceInfo { Line 250  sub showResourceInfo {
             $result.='<td>'.$display_part.'</td>'              $result.='<td>'.$display_part.'</td>'
                     .'<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'                      .'<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'
                     .'<td>'.&mt($responsetype).'</td>'                      .'<td>'.&mt($responsetype).'</td>'
 #                   .'<td><b>'.&mt('Handgrade: [_1]',$handgrade).'</b></td>'  #                   .'<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td>'
                     .&Apache::loncommon::end_data_table_row();                      .&Apache::loncommon::end_data_table_row();
         }          }
     }      }
Line 277  sub reset_caches { Line 274  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,$type,$trial,$rndseed)=@_;
  my $key = "$symb\0$uname\0$udom";   my $key = "$symb\0$uname\0$udom";
         if ($type eq 'randomizetry') {          if ($type eq 'randomizetry') {
             if ($trial ne '') {              if ($trial ne '') {
Line 311  sub reset_caches { Line 308  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') {          if ($type eq 'randomizetry') {
             $form{'grade_questiontype'} = $type;              $form{'grade_questiontype'} = $type;
             if ($rndseed ne '') {              if ($rndseed ne '') {
Line 354  sub reset_caches { Line 348  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 362  sub reset_caches { Line 356  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 398  sub cleanRecord { Line 383  sub cleanRecord {
     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 416  sub cleanRecord { Line 399  sub cleanRecord {
     $bottomrow.'</tr></table></blockquote>';      $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 472  sub cleanRecord { Line 453  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 =~ 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 509  sub cleanRecord { Line 490  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 824  sub verifyreceipt { Line 803  sub verifyreceipt {
  '<h3><span class="LC_info">'.   '<h3><span class="LC_info">'.
  &mt('Verifying Receipt No. [_1]',$receipt).   &mt('Verifying Receipt No. [_1]',$receipt).
  '</span></h3>'."\n".   '</span></h3>'."\n".
  '<h4>'.&mt('[_1]Resource: [_2]','<b>','</b>'.$env{'form.probTitle'}).   '<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
  '</h4>'."\n";   '</h4>'."\n";
   
     my ($string,$contents,$matches) = ('','',0);      my ($string,$contents,$matches) = ('','',0);
Line 921  sub listStudents { Line 900  sub listStudents {
   
     my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));      my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
   
     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(<<LISTJAVASCRIPT);      $request->print(<<LISTJAVASCRIPT);
 <script type="text/javascript" language="javascript">  <script type="text/javascript" language="javascript">
     function checkSelect(checkBox) {      function checkSelect(checkBox) {
Line 937  sub listStudents { Line 915  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 1176  LISTJAVASCRIPT Line 1154  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 />';
  }   }
Line 1261  sub processGroup { Line 1239  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(<<SUBJAVASCRIPT);      $request->print(<<SUBJAVASCRIPT);
 <script type="text/javascript" language="javascript">  <script type="text/javascript" language="javascript">
     function updateRadio(formname,id,weight) {      function updateRadio(formname,id,weight) {
Line 1381  sub sub_page_js { Line 1358  sub sub_page_js {
     }      }
  }   }
     }      }
       
  }   }
     }      }
       
  }   }
  if (val == "Grade Student") {   if (val == "Grade Student") {
     formname.showgrading.value = "yes";      formname.showgrading.value = "yes";
Line 1516  INNERJS Line 1495  INNERJS
   
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     $docopen=~s/^document\.//;      $docopen=~s/^document\.//;
     my %js_lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
                 keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',                  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.',                  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.',                  adds => 'Add selection to keyword list? Edit if desired.',
                 col1 => 'red',  
                 col2 => 'green',  
                 col3 => 'blue',  
                 siz1 => 'normal',  
                 siz2 => '+1',  
                 siz3 => '+2',  
                 sty1 => 'normal',  
                 sty2 => 'italic',  
                 sty3 => 'bold',  
              );  
     my %html_js_lt = &Apache::lonlocal::texthash(  
                 comp => 'Compose Message for: ',                  comp => 'Compose Message for: ',
                 incl => 'Include',                  incl => 'Include',
                 type => 'Type',                  type => 'Type',
Line 1544  INNERJS Line 1512  INNERJS
                 font => 'Font Size',                  font => 'Font Size',
                 fnst => 'Font Style',                  fnst => 'Font Style',
              );               );
     &js_escape(\%js_lt);  
     &html_escape(\%html_js_lt);  
     &js_escape(\%html_js_lt);  
     $request->print(<<SUBJAVASCRIPT);      $request->print(<<SUBJAVASCRIPT);
 <script type="text/javascript" language="javascript">  <script type="text/javascript" language="javascript">
   
 //===================== Show list of keywords ====================  //===================== Show list of keywords ====================
   function keywords(formname) {    function keywords(formname) {
     var nret = prompt("$js_lt{'keyw'}",formname.keywords.value);      var nret = prompt("$lt{'keyw'}",formname.keywords.value);
     if (nret==null) return;      if (nret==null) return;
     formname.keywords.value = nret;      formname.keywords.value = nret;
   
Line 1579  INNERJS Line 1544  INNERJS
     else return;      else return;
     var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");      var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
     if (cleantxt=="") {      if (cleantxt=="") {
  alert("$js_lt{'plse'}");   alert("$lt{'plse'}");
  return;   return;
     }      }
     var nret = prompt("$js_lt{'adds'}",cleantxt);      var nret = prompt("$lt{'adds'}",cleantxt);
     if (nret==null) return;      if (nret==null) return;
     document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;      document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
     if (document.SCORE.keywords.value != "") {      if (document.SCORE.keywords.value != "") {
Line 1646  INNERJS Line 1611  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=700,height='+height);
     pWin.focus();      pWin.focus();
     pDoc = pWin.document;      pDoc = pWin.document;
     pDoc.$docopen;      pDoc.$docopen;
Line 1662  INNERJS Line 1629  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("<h3><span class=\\"LC_info\\">&nbsp;$html_js_lt{'comp'}\"+fullname+\"<\\/span><\\/h3><br /><br />");      pDoc.write("<h3><span class=\\"LC_info\\">&nbsp;$lt{'comp'}\"+fullname+\"<\\/span><\\/h3><br /><br />");
   
     pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');      pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
     pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');      pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
     pDoc.write("<td><b>$html_js_lt{'type'}<\\/b><\\/td><td><b>$html_js_lt{'incl'}<\\/b><\\/td><td><b>$html_js_lt{'mesa'}<\\/td><\\/tr>");      pDoc.write("<td><b>$lt{'type'}<\\/b><\\/td><td><b>$lt{'incl'}<\\/b><\\/td><td><b>$lt{'mesa'}<\\/td><\\/tr>");
 }  }
     function displaySubject(msg,shwsel) {      function displaySubject(msg,shwsel) {
     pDoc = pWin.document;      pDoc = pWin.document;
     pDoc.write("<tr bgcolor=\\"#ffffdd\\">");      pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
     pDoc.write("<td>$html_js_lt{'subj'}<\\/td>");      pDoc.write("<td>$lt{'subj'}<\\/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><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>");      pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>");
 }  }
Line 1687  INNERJS Line 1654  INNERJS
   function newMsg(newmsg,shwsel) {    function newMsg(newmsg,shwsel) {
     pDoc = pWin.document;      pDoc = pWin.document;
     pDoc.write("<tr bgcolor=\\"#ffffdd\\">");      pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
     pDoc.write("<td align=\\"center\\">$html_js_lt{'new'}<\\/td>");      pDoc.write("<td align=\\"center\\">$lt{'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><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>");
 }  }
Line 1696  INNERJS Line 1663  INNERJS
     pDoc = pWin.document;      pDoc = pWin.document;
     pDoc.write("<\\/table>");      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=\\"$lt{'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=\\"$lt{'canc'}\\" 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();
Line 1711  INNERJS Line 1678  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 1756  INNERJS Line 1714  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;$lt{'kehi'}<\\/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>$lt{'txtc'}<\\/b><\\/td><td><b>$lt{'font'}<\\/b><\\/td><td><b>$lt{'fnst'}<\\/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=\\"$lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
       hDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" 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 1827  sub gradeBox { Line 1787  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 1835  sub gradeBox { Line 1795  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 1871  sub gradeBox { Line 1831  sub gradeBox {
     $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";      $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
   
   
    #&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
     $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().'<td colspan="6">';      $result.=&Apache::loncommon::end_data_table_row();
     $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 1884  sub gradeBox { Line 1845  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 1958  sub show_problem { Line 1918  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 2049  sub submission { Line 1996  sub submission {
     $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);       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 ''; }
   
     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])',  
                         $uname.':'.$udom,$usec,$env{'request.course.id'}).  
             '</span>');  
  $request->print(&show_grading_menu_form($symb));   $request->print(&show_grading_menu_form($symb));
  return;   return;
     }      }
Line 2081  sub submission { Line 2025  sub submission {
     &download_all_link($request, $symb);      &download_all_link($request, $symb);
  }   }
  $request->print('<h3>&nbsp;<span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n".   $request->print('<h3>&nbsp;<span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n".
  '<h4>&nbsp;'.&mt('[_1]Resource: [_2]','<b>','</b>'.$env{'form.probTitle'}).'</h4>'."\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 2098  sub submission { Line 2042  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 not to be blank    # kwclr is the only variable that is guaranteed to be non blank 
         # if this subroutine has been called once.          # if this subroutine has been called once.
  my %keyhash = ();   my %keyhash = ();
  if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {   if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
Line 2164  sub submission { Line 2108  sub submission {
  if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {   if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {
   
             my %lt = &Apache::lonlocal::texthash(              my %lt = &Apache::lonlocal::texthash(
                           keyh => 'Keyword Highlighting for Essays',  
                           keyw => 'Keyword Options',                            keyw => 'Keyword Options',
                           list => 'List',                            list => 'List',
                           past => 'Paste Selection to List',                            past => 'Paste Selection to List',
Line 2173  sub submission { Line 2116  sub submission {
 #  #
 # Print out the keyword options line  # Print out the keyword options line
 #  #
             $request->print(      $request->print(<<KEYWORDS);
                 '<div class="LC_columnSection">'  &nbsp;<b>$lt{'keyw'}:</b>&nbsp;
                .'<fieldset><legend>'.$lt{'keyh'}.'</legend>'  <a href="javascript:keywords(document.SCORE);" target="_self">$lt{'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">$lt{'past'}</a>&nbsp; &nbsp;
                      '<a href="#" onmousedown="javascript:getSel(); return false"  <a href="javascript:kwhighlight();" target="_self">$lt{'high'}</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
 #  #
Line 2192  sub submission { Line 2130  sub submission {
     my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);      my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
     $apath=&escape($apath);      $apath=&escape($apath);
     $apath=~s/\W/\_/gs;      $apath=~s/\W/\_/gs;
             &init_old_essays($symb,$apath,$adom,$aname);      &init_old_essays($symb,$apath,$adom,$aname);
         }          }
     }      }
   
Line 2209  sub submission { Line 2147  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 2273  sub submission { Line 2211  sub submission {
     #                  (for multi-response type part)      #                  (for multi-response type part)
     #             (3) Last submission plus the parts info      #             (3) Last submission plus the parts info
     #             (4) The whole record for this student      #             (4) The whole record for this student
       if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
  my ($string,$timestamp)= &get_last_submission(\%record);   my ($string,$timestamp)= &get_last_submission(\%record);
   
  my $lastsubonly;   my $lastsubonly;
Line 2296  sub submission { Line 2234  sub submission {
  if ($env{"form.$uname:$udom:$partid:submitted_by"}) {   if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
     if (exists($seenparts{$partid})) { next; }      if (exists($seenparts{$partid})) { next; }
     $seenparts{$partid}=1;      $seenparts{$partid}=1;
                     $request->print(      my $submitby='<b>Part:</b> '.$display_part.
                         '<b>'.&mt('Part: [_1]',$display_part).'</b>'.   ' <b>Collaborative submission by:</b> '.
                         ' <b>'.&mt('Collaborative submission by: [_1]',   '<a href="javascript:viewSubmitter(\''.
                                    '<a href="javascript:viewSubmitter(\''.   $env{"form.$uname:$udom:$partid:submitted_by"}.
                                    $env{"form.$uname:$udom:$partid:submitted_by"}.   '\');" target="_self">'.
                                    '\');" target="_self">'.   $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
                                    $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a>').      $request->print($submitby);
                         '<br />');  
     next;      next;
  }   }
  my $responsetype = $responseType->{$partid}->{$respid};   my $responsetype = $responseType->{$partid}->{$respid};
Line 2319  sub submission { Line 2256  sub submission {
  foreach my $submission (@$string) {   foreach my $submission (@$string) {
     my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);      my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
     if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }      if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
     my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4);      my ($ressub,$hide,$subval) = split(/:/,$submission,3);
     # Similarity check      # Similarity check
     my $similar='';      my $similar='';
                     my ($type,$trial,$rndseed);                      my ($type,$trial,$rndseed);
Line 2328  sub submission { Line 2265  sub submission {
                         $trial = $record{"resource.$partid.tries"};                          $trial = $record{"resource.$partid.tries"};
                         $rndseed = $record{"resource.$partid.rndseed"};                          $rndseed = $record{"resource.$partid.rndseed"};
                     }                      }
     if ($env{'form.checkPlag'}) {      if($env{'form.checkPlag'}){
  my ($oname,$odom,$ocrsid,$oessay,$osim)=   my ($oname,$odom,$ocrsid,$oessay,$osim)=
     &most_similar($uname,$udom,$symb,$subval);      &most_similar($uname,$udom,$symb,$subval);
  if ($osim) {   if ($osim) {
Line 2356  sub submission { Line 2293  sub submission {
     }      }
     my $order=&get_order($partid,$respid,$symb,$uname,$udom,      my $order=&get_order($partid,$respid,$symb,$uname,$udom,
                                          undef,$type,$trial,$rndseed);                                           undef,$type,$trial,$rndseed);
                     if ($env{'form.lastSub'} eq 'lastonly' || $env{'form.lastSub'} eq 'datesub' || $env{'form.lastSub'} =~ /^(last|all)$/ || ($env{'form.lastSub'} eq 'hdgrade' &&      if ($env{'form.lastSub'} eq 'lastonly' || 
                          $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {   ($env{'form.lastSub'} eq 'hdgrade' && 
    $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
  my $display_part=&get_display_part($partid,$symb);   my $display_part=&get_display_part($partid,$symb);
                         $lastsubonly.='<div class="LC_grade_submission_part">'.                          $lastsubonly.='<div class="LC_grade_submission_part">'.
                             '<b>'.&mt('Part: [_1]',$display_part).'</b>'.                              '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
Line 2369  sub submission { Line 2307  sub submission {
                             if ($hide eq 'anon') {                              if ($hide eq 'anon') {
                                 $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));                                  $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
                             } else {                              } else {
                                 $lastsubonly.='<br /><br />'.'<b>'.&mt('Submitted Files:').'</b>'                                  $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
                                             .'<br /><span class="LC_warning">';  
                                 if(@$files == 1) {  
                                     $lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!');  
                                 } else {  
                                     $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!');  
                                 }  
                                 $lastsubonly .= '</span>';  
   
                                 foreach my $file (@$files) {                                  foreach my $file (@$files) {
                                     &Apache::lonnet::allowuploaded('/adm/grades',$file);                                      &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 /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" /> '.$file.'</a>';
                                 }                                  }
                             }                              }
     $lastsubonly.='<br />';      $lastsubonly.='<br />';
  }   }
                         if ($hide eq 'anon') {                          if ($hide eq 'anon') {
                             $lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>';                               $lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>'; 
                         } else {                          } else {
     $lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>';      $lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
                             if ($draft) {  
                                 $lastsubonly.= ' <span class="LC_warning">'.&mt('Draft Copy').'</span>';  
                             }  
                             $subval =  
         &cleanRecord($subval,$responsetype,$symb,$partid,          &cleanRecord($subval,$responsetype,$symb,$partid,
      $respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);       $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";}   if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
  $lastsubonly.='</div>';   $lastsubonly.='</div>';
Line 2408  sub submission { Line 2330  sub submission {
     $lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body      $lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
  }   }
  $request->print($lastsubonly);   $request->print($lastsubonly);
    if ($env{'form.lastSub'} eq 'datesub') {     } elsif ($env{'form.lastSub'} eq 'datesub') {
  my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);   my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
  $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.':'
Line 2456  sub submission { Line 2375  sub submission {
     '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";      '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
  $result.='&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" 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";
Line 2646  sub get_last_submission { Line 2565  sub get_last_submission {
             }              }
             unless ($hide) {              unless ($hide) {
                 if (@randomize) {                  if (@randomize) {
                     foreach my $id (@randomize) {                      foreach my $id (@hidden) {
                         if ($key =~ /^\Q$id\E/) {                          if ($key =~ /^\Q$id\E/) {
                             $hide = 'rand';                              $hide = 'rand';
                             last;                              last;
Line 2655  sub get_last_submission { Line 2574  sub get_last_submission {
                 }                  }
             }              }
     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 2681  sub keywords_highlight { Line 2599  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) = shift;      my ($request) = shift;
     my ($symb)   = &get_symb($request);      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 2877  sub processHandGrade { Line 2614  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 3128  sub saveHandGrade { Line 2855  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 3238  sub saveHandGrade { Line 2960  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 3315  sub handback_files { Line 3007  sub handback_files {
         &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'.$counter,
Line 3339  sub handback_files { Line 3029  sub handback_files {
  $file_msg.='<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />";   $file_msg.='<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 />'.&mt('[_1] will be the uploaded file name [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>'));
                 }                  }
             }              }
         }          }
Line 3478  sub version_portfiles { Line 3168  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 3501  sub version_portfiles { Line 3189  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 3565  sub viewgrades_js { Line 3250  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(<<VIEWJAVASCRIPT);      $request->print(<<VIEWJAVASCRIPT);
 <script type="text/javascript" language="javascript">  <script type="text/javascript" language="javascript">
    function writePoint(partid,weight,point) {     function writePoint(partid,weight,point) {
Line 3746  sub viewgrades { Line 3430  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><b>'.&mt('Current Resource').':</b> '.$env{'form.probTitle'}.'</h4>'."\n";      $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 3761  sub viewgrades { Line 3445  sub viewgrades {
  '<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";   '<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 3857  sub viewgrades { Line 3493  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 3884  sub viewgrades { Line 3519  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 3910  sub viewgrades { Line 3541  sub viewgrades {
  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 3932  sub viewgrades { Line 3563  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 3941  sub viewgrades { Line 3572  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);      $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 4139  sub viewstudentgrade { Line 3663  sub viewstudentgrade {
 sub editgrades {  sub editgrades {
     my ($request) = @_;      my ($request) = @_;
   
     my ($symb)=&get_symb($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('Current Resource').':</b> '.$env{'form.probTitle'}.'</h4>'."\n";      $title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";
     $title.='<h4><b>'.&mt('Section:').'</b> '.$section_display.'</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 4177  sub editgrades { Line 3701  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 4194  sub editgrades { Line 3717  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 4210  sub editgrades { Line 3732  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;
    $line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
  my $usec=$classlist->{"$uname:$udom"}[5];   my $usec=$classlist->{"$uname:$udom"}[5];
         my $canmodify = &canmodify($usec);   if (!&canmodify($usec)) {
         my $line = '<td'.($canmodify?'':' colspan="2"').'>'.      my $numcols=scalar(@partid)*4+2;
                    &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';      push(@noupdate,
         if (!$canmodify) {   $line."<td colspan=\"$numcols\"><span class=\"LC_warning\">".
             push(@noupdate,   &mt('Not allowed to modify student')."</span></td></tr>");
                  $line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">".      next;
                  &mt('Not allowed to modify student')."</span></td>");   }
             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 4338  sub editgrades { Line 3860  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 4382  sub split_part_type { Line 3905  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 4424  ENDPICK Line 3945  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 4533  sub csvupload_fields { Line 4052  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 =<<CSVFORMJS;      my $result =<<CSVFORMJS;
 <script type="text/javascript" language="javascript">  <script type="text/javascript" language="javascript">
     function checkUpload(formname) {      function checkUpload(formname) {
Line 4606  sub csvuploadmap { Line 4123  sub csvuploadmap {
     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 4685  ENDPICK Line 4200  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));      $request->print(&show_grading_menu_form($symb));
     return '';      return '';
Line 4713  sub csvuploadassign { Line 4228  sub csvuploadassign {
     my ($symb)=&get_symb($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();
Line 4847  sub pickStudentPage { Line 4359  sub pickStudentPage {
     my ($request) = shift;      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(<<LISTJAVASCRIPT);      $request->print(<<LISTJAVASCRIPT);
 <script type="text/javascript" language="javascript">  <script type="text/javascript" language="javascript">
   
Line 5023  sub displayPage { Line 4534  sub displayPage {
     &Apache::lonnet::clear_EXT_cache_status();      &Apache::lonnet::clear_EXT_cache_status();
   
     if (!&canview($usec)) {      if (!&canview($usec)) {
  $request->print('<span class="LC_warning">'.   $request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>');
                         &mt('Unable to view requested student. ([_1])',   $request->print(&show_grading_menu_form($symb));
                             $env{'form.student'}).   return;
                         '</span>');  
         $request->print(&show_grading_menu_form($symb));  
         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 5100  sub displayPage { Line 4608  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]parts)',
  scalar(@{$parts}).'&nbsp;').')'   scalar(@{$parts}).'&nbsp;')
  ).   ).
  '</td>';   '</td>';
     $studentTable.='<td valign="top">';      $studentTable.='<td valign="top">';
Line 5142  sub displayPage { Line 4650  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 5185  sub displaySubByDates { Line 4691  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 5199  sub displaySubByDates { Line 4704  sub displaySubByDates {
   
     my $interaction;      my $interaction;
     my $no_increment = 1;      my $no_increment = 1;
     my (%lastrndseed,%lasttype);      my %lastrndseed;
     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 5216  sub displaySubByDates { Line 4719  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}) {
Line 5238  sub displaySubByDates { Line 4738  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('Response ID: [_1]',$responseId).')'
Line 5257  sub displaySubByDates { Line 4757  sub displaySubByDates {
         } 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 || $lastrndseed{$partid}) {
                                 if (($rndseed ne $lastrndseed{$partid}) &&                                  if ($rndseed ne $lastrndseed{$partid}) {
                                     (($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) {  
                                     $newvariation = '&nbsp;('.&mt('New variation this try').')';                                      $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});
Line 5365  sub updateGradeByPage { Line 4862  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 5386  sub updateGradeByPage { Line 4883  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 5483  sub updateGradeByPage { Line 4974  sub updateGradeByPage {
     $studentTable.=&show_grading_menu_form($env{'form.symb'});      $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 5522  like. Line 5010  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 5612  my %subdivided_bubble_lines;       # no. Line 5100  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 5630  sub save_bubble_lines { Line 5113  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 5650  sub restore_bubble_lines { Line 5128  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 5668  sub scantron_filenames { Line 5162  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 5716  sub scantron_uploads { Line 5208  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 5728  sub scantron_scantab { Line 5220  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 5814  sub scantron_selectphase { Line 5362  sub scantron_selectphase {
         # Chunk of form to prompt for a scantron file upload.          # Chunk of form to prompt for a scantron file upload.
   
         $r->print('          $r->print('
     <br />');      <br />
     my $default_form_data=&defaultFormData($symb);      '.&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 $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 $alertmsg = &mt('Please use the browse button to select a file from your local directory.');      $r->print('
     &js_escape(\$alertmsg);                <script type="text/javascript" language="javascript">
     my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom);  
     $r->print(&Apache::lonhtmlcommon::scripttag('  
     function checkUpload(formname) {      function checkUpload(formname) {
         if (formname.upfile.value == "") {          if (formname.upfile.value == "") {
             alert("'.$alertmsg.'");              alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
             return false;              return false;
         }          }
         formname.submit();          formname.submit();
     }'."\n".$formatjs));      }
     $r->print('                </script>
   
               <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.'
                 <input name="courseid" type="hidden" value="'.$cnum.'" />                  <input name="courseid" type="hidden" value="'.$cnum.'" />
                 <input name="domainid" type="hidden" value="'.$cdom.'" />                  <input name="domainid" type="hidden" value="'.$cdom.'" />
                 <input name="command" value="scantronupload_save" type="hidden" />                  <input name="command" value="scantronupload_save" type="hidden" />
               '.&Apache::loncommon::start_data_table('LC_scantron_action').'                  '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
               '.&Apache::loncommon::start_data_table_header_row().'                  <br />
                 <th>                  <input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
                 &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'                </form>
                 </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>'  
     );  
   
           $r->print('
               </td>
          '.&Apache::loncommon::end_data_table_row().'
          '.&Apache::loncommon::end_data_table().'
   ');
     }      }
   
     # Chunk of form to prompt for a file to grade and how:      # Chunk of form to prompt for a file to grade and how:
Line 5939  sub scantron_selectphase { Line 5477  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 5975  sub scantron_selectphase { Line 5513  sub scantron_selectphase {
     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 5998  sub username_to_idmap { Line 5625  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 6020  sub username_to_idmap { Line 5638  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 6190  sub digits_to_letters { Line 5808  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 6255  sub digits_to_letters { Line 5852  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 6296  sub scantron_parse_scanline { Line 5893  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 6327  sub scantron_parse_scanline { Line 5905  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 6347  sub scantron_parse_scanline { Line 5920  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 6362  sub scantron_parse_scanline { Line 5932  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 6376  sub scantron_parse_scanline { Line 5944  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 6454  sub scantron_validator_lettnum { Line 5965  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 6518  sub scantron_validator_lettnum { Line 6025  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 6561  sub scantron_validator_positional { Line 6067  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 6703  sub scantron_filter { Line 6205  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 6752  sub scantron_process_corrections { Line 6254  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 6872  sub check_for_error { Line 6370  sub check_for_error {
 sub scantron_warning_screen {  sub scantron_warning_screen {
     my ($button_text)=@_;      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>
 <br />  <br />
 <p> '.&mt("If this information is correct, please click on '[_1]'.",&mt($button_text)).'</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>  <p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p>
   
 <br />  <br />
 ');  ');
Line 6937  sub scantron_do_warning { Line 6429  sub scantron_do_warning {
  }    } 
     } else {      } else {
  my $warning=&scantron_warning_screen('Grading: Validate Records');   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" />
 ');  ');
Line 6981  SCANTRONFORM Line 6472  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 7007  sub scantron_validate_file { Line 6496  sub scantron_validate_file {
     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 7031  sub scantron_validate_file { Line 6520  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 7058  sub scantron_validate_file { Line 6543  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 7467  sub scantron_validate_sequence { Line 6951  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 7490  sub scantron_validate_ID { Line 6969  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 7553  sub scantron_validate_ID { Line 7032  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
Line 7604  sub scantron_get_correction { Line 7082  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>');
Line 7690  ENDSCRIPT Line 7168  ENDSCRIPT
  # 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 7699  ENDSCRIPT Line 7176  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));
Line 7715  ENDSCRIPT Line 7190  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 7738  sub verify_bubbles_checked { Line 7210  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 = (<<ENDSCRIPT);      my $output = (<<ENDSCRIPT);
 <script type="text/javascript">  <script type="text/javascript">
 function verify_bubble_radio(form) {  function verify_bubble_radio(form) {
Line 7778  used to fill in the scantron_questions f Line 7249  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 7800  sub questions_to_line_list { Line 7263  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 7817  sub questions_to_line_list { Line 7272  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 7848  for multi and missing bubble cases). Line 7295  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 7880  for multi and missing bubble cases). Line 7319  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 7907  sub prompt_for_corrections { Line 7335  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 7954  sub prompt_for_corrections { Line 7373  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 7967  sub scantron_bubble_selector { Line 7386  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 8118  sub get_codes { Line 7525  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 8134  sub scantron_validate_CODE { Line 7541  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 8188  sub scantron_validate_doublebubble { Line 7595  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 8234  sub scantron_validate_doublebubble { Line 7610  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 8250  sub scantron_validate_doublebubble { Line 7622  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 8269  sub scantron_get_maxbubble { Line 7641  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 8281  sub scantron_get_maxbubble { Line 7652  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 8317  sub scantron_get_maxbubble { Line 7685  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 8331  sub scantron_get_maxbubble { Line 7698  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 8353  sub scantron_get_maxbubble { Line 7719  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 8431  sub scantron_validate_missingbubbles { Line 7747  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 8477  sub scantron_validate_missingbubbles { Line 7776  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) = @_;      my ($r) = @_;
Line 8523  sub scantron_process_students { Line 7787  sub scantron_process_students {
     }      }
     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 8532  sub scantron_process_students { Line 7795  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 8568  SCANTRONFORM Line 7839  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',
        'Bubblesheet Progress',$count,
       'inline',undef,'scantronupload');
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
   'Processing first student');    'Processing first student');
     $r->print('<br />');      $r->print('<br />');
Line 8576  SCANTRONFORM Line 7849  SCANTRONFORM
     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 8593  SCANTRONFORM Line 7867  SCANTRONFORM
  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 8607  SCANTRONFORM Line 7880  SCANTRONFORM
      'last student');       '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 8627  SCANTRONFORM Line 7893  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 8656  SCANTRONFORM Line 7906  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 8683  SCANTRONFORM Line 7927  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);
Line 8696  SCANTRONFORM Line 7945  SCANTRONFORM
             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);
Line 8743  SCANTRONFORM Line 7975  SCANTRONFORM
                 }                  }
                 $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) {
Line 8768  SCANTRONFORM Line 7998  SCANTRONFORM
                               &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('Bubblesheet').'</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>'.&mt('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 8799  SCANTRONFORM Line 8029  SCANTRONFORM
 }  }
   
 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 8821  sub graders_resources_pass { Line 8049  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 8894  sub grade_student_bubbles { Line 8063  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 8924  sub grade_student_bubbles { Line 8083  sub grade_student_bubbles {
 sub scantron_upload_scantron_data {  sub scantron_upload_scantron_data {
     my ($r)=@_;      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 ($symb) = &get_symb($r,1);      my $default_form_data=&defaultFormData(&get_symb($r,1));
     my $default_form_data=&defaultFormData($symb);  
     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('
     $r->print(&Apache::lonhtmlcommon::scripttag('  <script type="text/javascript" language="javascript">
     function checkUpload(formname) {      function checkUpload(formname) {
  if (formname.upfile.value == "") {   if (formname.upfile.value == "") {
     alert("'.$nofile_alert.'");      alert("'.$nofile_alert.'");
Line 8965  sub scantron_upload_scantron_data { Line 8121  sub scantron_upload_scantron_data {
         return;          return;
     }      }
   
     '.$formatjs.'  </script>
 '));  
     $r->print('  
 <h3>'.&mt('Send bubblesheet data to a course').'</h3>  <h3>'.&mt('Send 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">
Line 8981  sub scantron_upload_scantron_data { Line 8136  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 8999  sub scantron_upload_scantron_data { Line 8149  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)=@_;      my($r)=@_;
Line 9099  sub scantron_upload_scantron_data_save { Line 8171  sub scantron_upload_scantron_data_save {
     }      }
     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>'));
  }   }
     }      }
Line 9174  sub validate_uploaded_scantron_file { Line 8209  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 9182  sub validate_uploaded_scantron_file { Line 8217  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 9217  sub validate_uploaded_scantron_file { Line 8252  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 9236  sub validate_uploaded_scantron_file { Line 8270  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 9284  sub valid_file { Line 8295  sub valid_file {
   
 sub scantron_download_scantron_data {  sub scantron_download_scantron_data {
     my ($r)=@_;      my ($r)=@_;
     my ($symb) = &get_symb($r,1);      my $default_form_data=&defaultFormData(&get_symb($r,1));
     my $default_form_data=&defaultFormData($symb);  
     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($symb));   $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 9306  sub scantron_download_scantron_data { Line 8316  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 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 9318  sub scantron_download_scantron_data { Line 8328  sub scantron_download_scantron_data {
       '<a href="'.$skipped.'">','</a>').'        '<a href="'.$skipped.'">','</a>').'
     </p>      </p>
 ');  ');
     $r->print(&show_grading_menu_form($symb));      $r->print(&show_grading_menu_form(&get_symb($r,1)));
     return '';      return '';
 }  }
   
Line 9328  sub checkscantron_results { Line 8338  sub checkscantron_results {
     if (!$symb) {return '';}      if (!$symb) {return '';}
     my $grading_menu_button=&show_grading_menu_form($symb);      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 9346  sub checkscantron_results { Line 8355  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 9368  sub checkscantron_results { Line 8367  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 9395  sub checkscantron_results { Line 8397  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 9409  sub checkscantron_results { Line 8411  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 9486  sub checkscantron_results { Line 8453  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 9509  sub checkscantron_results { Line 8476  sub checkscantron_results {
                   $env{'form.scantron_maxbubble'}).                    $env{'form.scantron_maxbubble'}).
               '</p>'                '</p>'
     );      );
     $r->print('<p>'      $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>');
              .&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 9539  sub checkscantron_results { Line 8502  sub checkscantron_results {
   
 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 9549  sub verify_scantron_grading { Line 8511  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 9659  sub verify_scantron_grading { Line 8615  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 -------
 #  #
 #-------------------------------------------------------------------  #-------------------------------------------------------------------
Line 9689  sub savedState { Line 8662  sub savedState {
     return \%savedState;      return \%savedState;
 }  }
   
 #--- Href with symb and command ---  
   
 sub href_symb_cmd {  
     my ($symb,$cmd)=@_;  
     return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&amp;command='.$cmd;  
 }  
   
 sub grading_menu {  sub grading_menu {
     my ($request) = @_;      my ($request) = @_;
     my ($symb)=&get_symb($request);      my ($symb)=&get_symb($request);
Line 9981  GRADINGMENUJS Line 8947  GRADINGMENUJS
     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 reset_perm {  sub reset_perm {
     undef(%perm);      undef(%perm);
 }  }
Line 10129  sub process_clicker { Line 9085  sub process_clicker {
     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.=<<ENDUPFORM;      $result.=<<ENDUPFORM;
 <script type="text/javascript">  <script type="text/javascript">
Line 10259  sub process_clicker_file { Line 9214  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,.&show_grading_menu_form($symb);  
         }  
     }      }
     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.&show_grading_menu_form($symb);          return $result.&show_grading_menu_form($symb);
     }      }
   
Line 10305  ENDHEADER Line 9258  ENDHEADER
     if ($env{'form.upfiletype'} eq 'interwrite') {      if ($env{'form.upfiletype'} eq 'interwrite') {
         ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);          ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);
     }      }
     if ($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.'" />'.
              &mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',               &mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',
Line 10362  ENDHEADER Line 9312  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 10439  sub interwrite_eval { Line 9389  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)=@_;      my ($r)=@_;
     my ($symb)=&get_symb($r);      my ($symb)=&get_symb($r);
Line 10537  sub assign_clicker_grades { Line 9462  sub assign_clicker_grades {
        if ($user) {         if ($user) {
           if ($users{$user}) {            if ($users{$user}) {
              $result.='<br /><span class="LC_warning">'.               $result.='<br /><span class="LC_warning">'.
                       &mt('More than one entry found for [_1]!','<tt>'.$user.'</tt>').                        &mt("More than one entry found for <tt>[_1]</tt>!",$user).
                       '</span><br />';                        '</span><br />';
           }            }
           $users{$user}=1;            $users{$user}=1;
Line 10605  sub navmap_errormsg { Line 9530  sub navmap_errormsg {
            '</div>';             '</div>';
 }  }
   
 sub startpage {  
     my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js,$onload) = @_;  
     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 {  
         $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));  
     }  
 }  
   
 sub handler {  sub handler {
     my $request=$_[0];      my $request=$_[0];
     &reset_caches();      &reset_caches();
Line 10647  sub handler { Line 9551  sub handler {
     $ssi_error = 0;      $ssi_error = 0;
     my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];      my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];
     my $start_page = &Apache::loncommon::start_page('Grading',undef,      my $start_page = &Apache::loncommon::start_page('Grading',undef,
                                                     {'bread_crumbs' => $brcrum});                                            {'bread_crumbs' => $brcrum});
     if ($symb eq '' && $command eq '') {      if ($symb eq '' && $command eq '') {
  if ($env{'user.adv'}) {   if ($env{'user.adv'}) {
             &Apache::loncommon::content_type($request,'text/html');              &Apache::loncommon::content_type($request,'text/html');
Line 10680  sub handler { Line 9584  sub handler {
             &init_perm();               &init_perm(); 
             if (!%perm) {              if (!%perm) {
                 $request->internal_redirect('/adm/quickgrades');                  $request->internal_redirect('/adm/quickgrades');
                 return OK;  
             } else {              } else {
                 &Apache::loncommon::content_type($request,'text/html');                  &Apache::loncommon::content_type($request,'text/html');
                 $request->send_http_header;                  $request->send_http_header;
Line 10701  sub handler { Line 9604  sub handler {
         }          }
         &Apache::loncommon::content_type($request,'text/html');          &Apache::loncommon::content_type($request,'text/html');
         $request->send_http_header;          $request->send_http_header;
         if (($command eq 'scantron_selectphase' && $perm{'mgr'}) ||           $request->print($start_page);
             (($command eq 'scantronupload') &&  
              (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||  
               &Apache::lonnet::allowed('usc',$env{'request.course.id'})))) {  
             &startpage($request,$symb,[{href=>'/adm/grades', text=>"Grading"}],1,1,  
                        undef,undef,undef,undef,'toggleScantab(document.rules);');  
         } else {  
             unless ((($command eq 'submission' || $command eq 'versionsub')) && ($perm{'vgr'})) {  
                 $request->print($start_page);   
             }  
         }  
  if ($command eq 'submission' && $perm{'vgr'}) {   if ($command eq 'submission' && $perm{'vgr'}) {
             my ($stuvcurrent,$stuvdisp,$versionform,$js);  
             if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) {  
                 ($stuvcurrent,$stuvdisp,$versionform,$js) =  
                     &choose_task_version_form($symb,$env{'form.student'},  
                                               $env{'form.userdom'});  
             }  
             &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,$stuvcurrent,$stuvdisp,undef,$js);  
             if ($versionform) {  
                 $request->print($versionform);  
             }  
             $request->print('<br clear="all" />');  
     ($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));      ($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
         } 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'}) {   } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
     &pickStudentPage($request);      &pickStudentPage($request);
  } elsif ($command eq 'displayPage' && $perm{'vgr'}) {   } elsif ($command eq 'displayPage' && $perm{'vgr'}) {
Line 10844  At least the logic that drives this has Line 9715  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 10889  ssi_with_retries() Line 9760  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 10906  ssi_with_retries() Line 9777  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 10925  ssi_with_retries() Line 9786  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 10936  ssi_with_retries() Line 9795  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.  

Removed from v.1.596.2.12.2.41.2.4  
changed lines
  Added in v.1.596.2.13


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