[BACK]Return to grades.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.470 and 1.473

version 1.470, 2007/10/29 09:46:28 version 1.473, 2007/10/31 18:01:34
Line 5316  sub scantron_parse_scanline { Line 5316  sub scantron_parse_scanline {
     } elsif (!defined($currentquest)      } elsif (!defined($currentquest)
      || (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest))       || (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest))
      || (&occurence_count($currentquest, "[A-Z]") == 0)) {       || (&occurence_count($currentquest, "[A-Z]") == 0)) {
  &Apache::lonnet::logthis("Missing if, $questnum, $ansnum");  
  for (my $ans = 0; $ans < $answers_needed; $ans++ ) {   for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
     $record{"scantron.$ansnum.answer"}='';      $record{"scantron.$ansnum.answer"}='';
     $ansnum++;      $ansnum++;
   
  }   }
  if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {   if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
     &Apache::lonnet::logthis("Parsed missing: $questnum");  
     push(@{$record{"scantron.missingerror"}},$questnum);      push(@{$record{"scantron.missingerror"}},$questnum);
    #  $ansnum += $answers_needed;     #  $ansnum += $answers_needed;
  }   }
  &Apache::lonnet::logthis("Residual scanline:  '$questions'");  
   
     } else {      } else {
  for (my $ans = 0; $ans < $answers_needed; $ans++) {   for (my $ans = 0; $ans < $answers_needed; $ans++) {
     $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);      $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
Line 6487  ENDSCRIPT Line 6483  ENDSCRIPT
  foreach my $question (@{$arg}) {   foreach my $question (@{$arg}) {
     my $selected = &get_response_bubbles($scan_record, $question);      my $selected = &get_response_bubbles($scan_record, $question);
     my @select_array = split(/:/,$selected); # ought to be an array of empties.      my @select_array = split(/:/,$selected); # ought to be an array of empties.
     &Apache::lonnet::logthis("Calling bubble selector (missing)");  
     &scantron_bubble_selector($r,$scan_config,$question, @select_array);      &scantron_bubble_selector($r,$scan_config,$question, @select_array);
  }   }
     } else {      } else {
Line 6529  sub scantron_bubble_selector { Line 6524  sub scantron_bubble_selector {
   
     my $total_lines = $lines*2;      my $total_lines = $lines*2;
     my @alphabet=('A'..'Z');      my @alphabet=('A'..'Z');
     &Apache::lonnet::logthis("Putting in question number $quest");  
     $r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");      $r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");
   
     for (my $l = 0; $l < $lines; $l++) {      for (my $l = 0; $l < $lines; $l++) {
Line 6885  sub scantron_validate_missingbubbles { Line 6879  sub scantron_validate_missingbubbles {
   
  foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {   foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
     if ($missing > $max_bubble) { next; }      if ($missing > $max_bubble) { next; }
     &Apache::lonnet::logthis("Marking $missing for missing bubble check");  
     push(@to_correct,$missing);      push(@to_correct,$missing);
  }   }
  if (@to_correct) {   if (@to_correct) {
Line 7397  sub submit_options { Line 7390  sub submit_options {
 </script>  </script>
 GRADINGMENUJS  GRADINGMENUJS
     &commonJSfunctions($request);      &commonJSfunctions($request);
     my $result='<h3>&nbsp;<span class="LC_info">Manual Grading/View Submission</span></h3>';  
     my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);      my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
     $result.=$table;      my $result;
     my (undef,$sections) = &getclasslist('all','0');      my (undef,$sections) = &getclasslist('all','0');
     my $savedState = &savedState();      my $savedState = &savedState();
     my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});      my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
Line 7416  GRADINGMENUJS Line 7408  GRADINGMENUJS
  '<input type="hidden" name="gradingMenu" value="1" />'."\n".   '<input type="hidden" name="gradingMenu" value="1" />'."\n".
  '<input type="hidden" name="showgrading" value="yes" />'."\n";   '<input type="hidden" name="showgrading" value="yes" />'."\n";
   
     $result.='<table border="0"><tr><td bgcolor=#777777>'."\n".      $result.='
  '<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n".      <div class="LC_grade_select_mode">
  '&nbsp;<b>Select a Grading/Viewing Option</b></td></tr>'."\n".        <div class="LC_grade_select_mode_current">
  '<tr bgcolor="#ffffe6" valign="top"><td>'."\n";          <h2>
             '.&mt('Grade Current Resource').'
     $result.='<table width="100%" border="0">';          </h2>
     $result.='<tr bgcolor="#ffffe6" valign="top">'."\n";          <div class="LC_grade_select_mode_body">
     $result.='<td><b>'.&mt('Sections').'</b></td>';            <div class="LC_grades_resource_info">
     $result.='<td><b>'.&mt('Groups').'</b></td>';             '.$table.'
     $result.='<td><b>'.&mt('Access Status').'</td>'."\n";            </div>
     $result.='<td><b>'.&mt('Submission Status').'</td>'."\n";            <div class="LC_grade_select_mode_selector">
     $result.='</tr>';               <div class="LC_grade_select_mode_selector_header">
     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".                  '.&mt('Sections').'
  '&nbsp;<select name="section" multiple="multiple" size="3">'."\n";               </div>
                <div class="LC_grade_select_mode_selector_body">
          <select name="section" multiple="multiple" size="5">'."\n";
     if (ref($sections)) {      if (ref($sections)) {
  foreach (sort (@$sections)) {   foreach my $section (sort (@$sections)) {
     $result.='<option value="'.$_.'" '.      $result.='<option value="'.$section.'" '.
  ($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";   ($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
  }   }
     }      }
     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';      $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
     $result.= '</td><td>'."\n";      $result.='
     $result.= &Apache::lonstatistics::GroupSelect('group','multiple',3);               </div>
     $result.='</td><td>'."\n";            </div>
     $result.=&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,3,undef,'mult');            <div class="LC_grade_select_mode_selector">
                <div class="LC_grade_select_mode_selector_header">
     $result.='</td>';                  '.&mt('Groups').'
     $result.='<td><select name="submitonly" size="3">'.               </div>
  '<option value="yes" '.               <div class="LC_grade_select_mode_selector_body">
  ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>'.                  '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
  '<option value="queued" '.               </div>
  ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>'.            </div>
  '<option value="graded" '.            <div class="LC_grade_select_mode_selector">
  ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>'.               <div class="LC_grade_select_mode_selector_header">
  '<option value="incorrect" '.                  '.&mt('Access Status').'
  ($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>'.               </div>
  '<option value="all" '.               <div class="LC_grade_select_mode_selector_body">
  ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>';                  '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
                </div>
     $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3"><label>'.            </div>
  '<input type="radio" name="radioChoice" value="submission" '.            <div class="LC_grade_select_mode_selector">
  ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').               <div class="LC_grade_select_mode_selector_header">
  '</label> </td></tr>'."\n";                  '.&mt('Submission Status').'
                </div>
     $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3">'.               <div class="LC_grade_select_mode_selector_body">
  '<label><input type="radio" name="radioChoice" value="viewgrades" '.                 <select name="submitonly" size="5">
  ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.           <option value="yes" '.      ($saveSub eq 'yes'       ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
  '<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n";           <option value="queued" '.   ($saveSub eq 'queued'    ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
            <option value="graded" '.   ($saveSub eq 'graded'    ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
     $result.='<tr bgcolor="#ffffe6"><td colspan="3"><br />'.           <option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
  '<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.                   <option value="all" '.      ($saveSub eq 'all'       ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>
  '</td></tr>'."\n";                 </select>
                </div>
             </div>
     $result.='<tr bgcolor="#ffffe6" valign="top"><td colspan="3">'.            <div class="LC_grade_select_mode_type_body">
  '<br /><label><input type="radio" name="radioChoice" value="pickStudentPage" '.              <div class="LC_grade_select_mode_type">
  ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.                <label>
  'The <b>complete</b> set/page/sequence/folder: For one student</label></td></tr>'."\n";                  <input type="radio" name="radioChoice" value="submission" '.
                     ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
     $result.='<tr bgcolor="#ffffe6"><td colspan="3"><br />'.               &mt('Select individual students to grade and view submissions.').'
  '<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.        </label> 
  '</td></tr></table>'."\n";              </div>
               <div class="LC_grade_select_mode_type">
     $result.='</td>'; #<td valign="top">';        <label>
                   <input type="radio" name="radioChoice" value="viewgrades" '.
 #    $result.='<table width="100%" border="0">';                    ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
 #    $result.='<tr bgcolor="#ffffe6"><td>'.                      &mt('Grade all selected students in a grading table.').'
 # '<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.                </label>
 # ' '.&mt('scores from file').' </td></tr>'."\n";              </div>
 #              <div class="LC_grade_select_mode_type">
 #    $result.='<tr bgcolor="#ffffe6"><td>'.        <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
 #        '<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'.              </div>
 #        ' '.&mt('clicker file').' </td></tr>'."\n";            </div>
 #          </div>
 #    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.        </div>
 # '<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.        <div class="LC_grade_select_mode_page">
 # '" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";          <h2>
 #           '.&mt('Grade Complete Folder for One Student').'
 #    if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {          </h2>
 # $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.          <div class="LC_grades_select_mode_body">
 #    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.            <div class="LC_grade_select_mode_type_body">
 #    ' '.&mt('receipt').': '.              <div class="LC_grade_select_mode_type">
 #    &Apache::lonnet::recprefix($env{'request.course.id'}).                <label>
 #    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.                  <input type="radio" name="radioChoice" value="pickStudentPage" '.
 #    '</td></tr>'."\n";    ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
 #    }     &mt('The <b>complete</b> page/sequence/folder: For one student').'
 #    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.                </label>
 # '<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.              </div>
 # '" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";              <div class="LC_grade_select_mode_type">
 #    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.        <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
 # '<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.              </div>
 # '" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";            </div>
 #          </div>
 #    $result.='</table>'."\n".'</td>';        </div>
     $result.= '</tr></table>'."\n".      </div>
  '</td></tr></table></form>'."\n";    </form>';
     return $result;      return $result;
 }  }
   
Removed from v.1.470  
changed lines
  Added in v.1.473

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