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

Diff for /loncom/homework/grades.pm between versions 1.596.2.6 and 1.596.2.12

version 1.596.2.6, 2011/10/10 18:55:39 version 1.596.2.12, 2011/12/01 00:36:59
Line 416  sub cleanRecord { Line 416  sub cleanRecord {
     '<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.      '<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.
     $middlerow.'</tr>'.      $middlerow.'</tr>'.
     '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.      '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
     $bottomrow.'</tr>'.'</table></blockquote>';      $bottomrow.'</tr></table></blockquote>';
     } elsif ($response eq 'radiobutton') {      } elsif ($response eq 'radiobutton') {
  my %answer=&Apache::lonnet::str2hash($answer);   my %answer=&Apache::lonnet::str2hash($answer);
  my ($toprow,$bottomrow);   my ($toprow,$bottomrow);
Line 2106  sub submission { Line 2106  sub submission {
                           keyw => 'Keyword Options',                            keyw => 'Keyword Options',
                           list => 'List',                            list => 'List',
                           past => 'Paste Selection to List',                            past => 'Paste Selection to List',
                           high => 'Hightlight Attribute',                            high => 'Highlight Attribute',
                      );                       );
 #  #
 # Print out the keyword options line  # Print out the keyword options line
Line 2468  sub check_collaborators { Line 2468  sub check_collaborators {
     (split(/[,;\s]+/,$record->{'resource.'.$part.'.collaborators'})) {       (split(/[,;\s]+/,$record->{'resource.'.$part.'.collaborators'})) { 
     $possible_collaborator =~ s/[\$\^\(\)]//g;      $possible_collaborator =~ s/[\$\^\(\)]//g;
     next if ($possible_collaborator eq '');      next if ($possible_collaborator eq '');
     my ($co_name,$co_dom) = split(/\@|:/,$possible_collaborator);      my ($co_name,$co_dom) = split(/:/,$possible_collaborator);
     $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);      $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);
     next if ($co_name eq $uname && $co_dom eq $udom);      next if ($co_name eq $uname && $co_dom eq $udom);
     # Doing this grep allows 'fuzzy' specification      # Doing this grep allows 'fuzzy' specification
Line 2481  sub check_collaborators { Line 2481  sub check_collaborators {
     }      }
  }   }
  if (scalar(@good_collaborators) != 0) {   if (scalar(@good_collaborators) != 0) {
     $result.='<br />'.&mt('Collaborators: ').'<ol>';      $result.='<br />'.&mt('Collaborators:').'<ol>';
     foreach my $name (@good_collaborators) {      foreach my $name (@good_collaborators) {
  my ($lastname,$givenn) = split(/,/,$$fullname{$name});   my ($lastname,$givenn) = split(/,/,$$fullname{$name});
  push(@col_fullnames, $givenn.' '.$lastname);   push(@col_fullnames, $givenn.' '.$lastname);
Line 7051  sub scantron_get_correction { Line 7051  sub scantron_get_correction {
        .&mt('The ID on the form is [_1]',         .&mt('The ID on the form is [_1]',
             "<tt>$$scan_record{'scantron.ID'}</tt>")              "<tt>$$scan_record{'scantron.ID'}</tt>")
        .'<br />'         .'<br />'
        .&mt('The name on the paper is [_2], [_3]',         .&mt('The name on the paper is [_1], [_2]',
             $$scan_record{'scantron.LastName'},              $$scan_record{'scantron.LastName'},
             $$scan_record{'scantron.FirstName'})              $$scan_record{'scantron.FirstName'})
        .'</p>';         .'</p>';
Line 7176  ENDSCRIPT Line 7176  ENDSCRIPT
  }   }
         $r->print(&verify_bubbles_checked(@lines_to_correct));          $r->print(&verify_bubbles_checked(@lines_to_correct));
     } elsif ($error eq 'missingbubble') {      } elsif ($error eq 'missingbubble') {
  $r->print('<p class="LC_warning">.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n");   $r->print('<p class="LC_warning">'.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n");
  $r->print($message);   $r->print($message);
  $r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");   $r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");
  $r->print(&mt("Some questions have no scanned bubbles.")."\n");   $r->print(&mt("Some questions have no scanned bubbles.")."\n");
Line 8464  sub checkscantron_results { Line 8464  sub checkscantron_results {
         }          }
     }      }
     $r->print('<p>'.      $r->print('<p>'.
               &mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3]  ([_4] bubblesheet lines/student).',                &mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).',
                   '<b>',                    '<b>',
                   $numstudents,                    $numstudents,
                   '</b>',                    '</b>',
Line 9382  sub assign_clicker_grades { Line 9382  sub assign_clicker_grades {
 # FIXME: This should probably look for the first handgradeable part  # FIXME: This should probably look for the first handgradeable part
     my $part=$$partlist[0];      my $part=$$partlist[0];
 # Start screen output  # Start screen output
     my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}).'<br />';      my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
   
     $result .= &Apache::loncommon::start_data_table().      $result .= '<br />'.
                  &Apache::loncommon::start_data_table().
                &Apache::loncommon::start_data_table_header_row().                 &Apache::loncommon::start_data_table_header_row().
                '<th>'.&mt('Assigning grades based on clicker file').'</th>'.                 '<th>'.&mt('Assigning grades based on clicker file').'</th>'.
                &Apache::loncommon::end_data_table_header_row().                 &Apache::loncommon::end_data_table_header_row().
Line 9572  sub handler { Line 9573  sub handler {
     } else {      } else {
         &init_perm();          &init_perm();
         if (!$env{'request.course.id'}) {          if (!$env{'request.course.id'}) {
             # Not in a course.              unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) &&
             $env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";                      ($command =~ /^scantronupload/)) {
             return HTTP_NOT_ACCEPTABLE;                  # Not in a course.
                   $env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";
                   return HTTP_NOT_ACCEPTABLE;
               }
         } elsif (!%perm) {          } elsif (!%perm) {
             $request->internal_redirect('/adm/quickgrades');              $request->internal_redirect('/adm/quickgrades');
         }          }
Removed from v.1.596.2.6  
changed lines
  Added in v.1.596.2.12

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