--- loncom/homework/grades.pm 2007/09/02 01:59:57 1.437
+++ loncom/homework/grades.pm 2007/11/13 01:14:32 1.488
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.437 2007/09/02 01:59:57 www Exp $
+# $Id: grades.pm,v 1.488 2007/11/13 01:14:32 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,6 +35,7 @@ use Apache::loncommon;
use Apache::lonhtmlcommon;
use Apache::lonnavmaps;
use Apache::lonhomework;
+use Apache::lonpickcode;
use Apache::loncoursedata;
use Apache::lonmsg();
use Apache::Constants qw(:common);
@@ -47,37 +48,102 @@ use POSIX qw(floor);
my %perm=();
-my %bubble_lines_per_response; # no. bubble lines for each response.
+my %bubble_lines_per_response = (); # no. bubble lines for each response.
# index is "symb.part_id"
+my %first_bubble_line = (); # First bubble line no. for each bubble.
+
+# Save and restore the bubble lines array to the form env.
+
+
+sub save_bubble_lines {
+ foreach my $line (keys(%bubble_lines_per_response)) {
+ $env{"form.scantron.bubblelines.$line"} = $bubble_lines_per_response{$line};
+ $env{"form.scantron.first_bubble_line.$line"} =
+ $first_bubble_line{$line};
+ }
+}
+
+
+sub restore_bubble_lines {
+ my $line = 0;
+ %bubble_lines_per_response = ();
+ while ($env{"form.scantron.bubblelines.$line"}) {
+ my $value = $env{"form.scantron.bubblelines.$line"};
+ $bubble_lines_per_response{$line} = $value;
+ $first_bubble_line{$line} =
+ $env{"form.scantron.first_bubble_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;
+}
+
# ----- These first few routines are general use routines.----
+
+# Return the number of occurences of a pattern in a string.
+
+sub occurence_count {
+ my ($string, $pattern) = @_;
+
+ my @matches = ($string =~ /$pattern/g);
+
+ return scalar(@matches);
+}
+
+
+# Take a string known to have digits and convert all the
+# digits into letters in the range J,A..I.
+
+sub digits_to_letters {
+ my ($input) = @_;
+
+ my @alphabet = ('J', 'A'..'I');
+
+ my @input = split(//, $input);
+ my $output ='';
+ for (my $i = 0; $i < scalar(@input); $i++) {
+ if ($input[$i] =~ /\d/) {
+ $output .= $alphabet[$input[$i]];
+ } else {
+ $output .= $input[$i];
+ }
+ }
+ return $output;
+}
+
#
# --- Retrieve the parts from the metadata file.---
sub getpartlist {
my ($symb) = @_;
- my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
- my $partorder = &Apache::lonnet::metadata($url, 'partorder');
- my @parts;
- if ($partorder) {
- for my $part (split (/,/,$partorder)) {
- if (!&Apache::loncommon::check_if_partid_hidden($part,$symb)) {
- push(@parts, $part);
- }
- }
- } else {
- my $metadata = &Apache::lonnet::metadata($url, 'packages');
- foreach (split(/\,/,$metadata)) {
- if ($_ =~ /^part_(.*)$/) {
- if (!&Apache::loncommon::check_if_partid_hidden($1,$symb)) {
- push(@parts, $1);
- }
- }
- }
- }
+
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ my $res = $navmap->getBySymb($symb);
+ my $partlist = $res->parts();
+ my $url = $res->src();
+ my @metakeys = split(/,/,&Apache::lonnet::metadata($url,'keys'));
+
my @stores;
- foreach my $part (@parts) {
- my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
+ foreach my $part (@{ $partlist }) {
foreach my $key (@metakeys) {
if ($key =~ m/^stores_\Q$part\E_/) { push(@stores,$key); }
}
@@ -105,7 +171,7 @@ sub get_symb {
sub nameUserString {
my ($type,$fullname,$uname,$udom) = @_;
if ($type eq 'header') {
- return '<b> Fullname </b><span class="LC_internal_info">(Username)</span>';
+ return '<b> '.&mt('Fullname').' </b><span class="LC_internal_info">('.&mt('Username').')</span>';
} else {
return ' '.$fullname.'<span class="LC_internal_info"> ('.$uname.
($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>';
@@ -188,10 +254,10 @@ sub showResourceInfo {
$partsseen{$partID}=1;
}
my $display_part=&get_display_part($partID,$symb);
- $result.='<td><b>Part: </b>'.$display_part.' <span class="LC_internal_info">'.
+ $result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'.
$resID.'</span></td>'.
- '<td><b>Type: </b>'.$responsetype.'</td></tr>';
-# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
+ '<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>';
+# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
}
}
$result.='</table>'."\n";
@@ -266,8 +332,8 @@ sub cleanRecord {
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}
return '<blockquote><table border="1">'.
- '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
- '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
+ '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
+ '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'match') {
my %answer=&Apache::lonnet::str2hash($answer);
@@ -286,10 +352,10 @@ sub cleanRecord {
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}
return '<blockquote><table border="1">'.
- '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
- '<tr valign="top"><td>'.$grayFont.'Item ID</span></td>'.
+ '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
+ '<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.
$middlerow.'</tr>'.
- '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
+ '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'radiobutton') {
my %answer=&Apache::lonnet::str2hash($answer);
@@ -299,18 +365,18 @@ sub cleanRecord {
foreach my $foil (@$order) {
if (exists($answer{$foil})) {
if ($foil eq $correct) {
- $toprow.='<td><b>true</b></td>';
+ $toprow.='<td><b>'.&mt('true').'</b></td>';
} else {
- $toprow.='<td><i>true</i></td>';
+ $toprow.='<td><i>'.&mt('true').'</i></td>';
}
} else {
- $toprow.='<td>false</td>';
+ $toprow.='<td>'.&mt('false').'</td>';
}
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}
return '<blockquote><table border="1">'.
- '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
- '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
+ '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
+ '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'essay') {
if (! exists ($env{'form.'.$symb})) {
@@ -362,7 +428,10 @@ sub cleanRecord {
$result.='</ul>';
return $result;
}
-
+ } elsif ( $response =~ m/(?:numerical|formula)/) {
+ $answer =
+ &Apache::loncommon::format_previous_attempt_value('submission',
+ $answer);
}
return $answer;
}
@@ -406,8 +475,10 @@ COMMONJSFUNCTIONS
#--- Dumps the class list with usernames,list of sections,
#--- section, ids and fullnames for each user.
sub getclasslist {
- my ($getsec,$filterlist) = @_;
+ my ($getsec,$filterlist,$getgroup) = @_;
my @getsec;
+ my @getgroup;
+ my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
if (!ref($getsec)) {
if ($getsec ne '' && $getsec ne 'all') {
@getsec=($getsec);
@@ -416,10 +487,19 @@ sub getclasslist {
@getsec=@{$getsec};
}
if (grep(/^all$/,@getsec)) { undef(@getsec); }
+ if (!ref($getgroup)) {
+ if ($getgroup ne '' && $getgroup ne 'all') {
+ @getgroup=($getgroup);
+ }
+ } else {
+ @getgroup=@{$getgroup};
+ }
+ if (grep(/^all$/,@getgroup)) { undef(@getgroup); }
- my $classlist=&Apache::loncoursedata::get_classlist();
+ my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
# Bail out if we were unable to get the classlist
return if (! defined($classlist));
+ &Apache::loncoursedata::get_group_memberships($classlist,$keylist);
#
my %sections;
my %fullnames;
@@ -436,18 +516,40 @@ sub getclasslist {
$classlist->{$student}->[&Apache::loncoursedata::CL_FULLNAME()];
my $status =
$classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];
+ my $group =
+ $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
# filter students according to status selected
- if ($filterlist && $env{'form.Status'} ne 'Any') {
- if ($env{'form.Status'} ne $status) {
- delete ($classlist->{$student});
+ if ($filterlist && (!($stu_status =~ /Any/))) {
+ if (!($stu_status =~ $status)) {
+ delete($classlist->{$student});
next;
}
}
+ # filter students according to groups selected
+ my @stu_groups = split(/,/,$group);
+ if (@getgroup) {
+ my $exclude = 1;
+ foreach my $grp (@getgroup) {
+ foreach my $stu_group (@stu_groups) {
+ if ($stu_group eq $grp) {
+ $exclude = 0;
+ }
+ }
+ if (($grp eq 'none') && !$group) {
+ $exclude = 0;
+ }
+ }
+ if ($exclude) {
+ delete($classlist->{$student});
+ }
+ }
$section = ($section ne '' ? $section : 'none');
if (&canview($section)) {
if (!@getsec || grep(/^\Q$section\E$/,@getsec)) {
$sections{$section}++;
- $fullnames{$student}=$fullname;
+ if ($classlist->{$student}) {
+ $fullnames{$student}=$fullname;
+ }
} else {
delete($classlist->{$student});
}
@@ -520,6 +622,7 @@ sub student_gradeStatus {
# Shows a student's view of problem and submission
sub jscriptNform {
my ($symb) = @_;
+ my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
my $jscript='<script type="text/javascript" language="javascript">'."\n".
' function viewOneStudent(user,domain) {'."\n".
' document.onestudent.student.value = user;'."\n".
@@ -531,7 +634,7 @@ sub jscriptNform {
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
- '<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".
'<input type="hidden" name="command" value="submission" />'."\n".
'<input type="hidden" name="student" value="" />'."\n".
'<input type="hidden" name="userdom" value="" />'."\n".
@@ -539,6 +642,8 @@ sub jscriptNform {
return $jscript;
}
+
+
# Given the score (as a number [0-1] and the weight) what is the final
# point value? This function will round to the nearest tenth, third,
# or quarter if one of those is within the tolerance of .00001.
@@ -628,9 +733,12 @@ sub verifyreceipt {
$receipt =~ s/[^\-\d]//g;
my ($symb) = &get_symb($request);
- my $title.='<h3><span class="LC_info">Verifying Submission Receipt '.
- $receipt.'</h3></span>'."\n".
- '<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><br /><br />'."\n";
+ my $title.=
+ '<h3><span class="LC_info">'.
+ &mt('Verifying Submission Receipt [_1]',$receipt).
+ '</span></h3>'."\n".
+ '<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
+ '</h4>'."\n";
my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');
@@ -640,6 +748,19 @@ sub verifyreceipt {
$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
my $parts=['0'];
if ($receiptparts) { ($parts)=&response_type($symb); }
+
+ my $header =
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th> '.&mt('Fullname').' </th>'."\n".
+ '<th> '.&mt('Username').' </th>'."\n".
+ '<th> '.&mt('Domain').' </th>';
+ if ($receiptparts) {
+ $header.='<th> '.&mt('Problem Part').' </th>';
+ }
+ $header.=
+ &Apache::loncommon::end_data_table_header_row();
+
foreach (sort
{
if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
@@ -650,7 +771,9 @@ sub verifyreceipt {
my ($uname,$udom)=split(/\:/);
foreach my $part (@$parts) {
if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
- $contents.='<tr bgcolor="#ffffe6"><td> '."\n".
+ $contents.=
+ &Apache::loncommon::start_data_table_row().
+ '<td> '."\n".
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
'\');" target="_self">'.$$fullname{$_}.'</a> </td>'."\n".
'<td> '.$uname.' </td>'.
@@ -658,28 +781,23 @@ sub verifyreceipt {
if ($receiptparts) {
$contents.='<td> '.$part.' </td>';
}
- $contents.='</tr>'."\n";
+ $contents.=
+ &Apache::loncommon::end_data_table_row()."\n";
$matches++;
}
}
}
if ($matches == 0) {
- $string = $title.'No match found for the above receipt.';
+ $string = $title.&mt('No match found for the above receipt.');
} else {
$string = &jscriptNform($symb).$title.
- 'The above receipt matches the following student'.
- ($matches <= 1 ? '.' : 's.')."\n".
- '<table border="0"><tr><td bgcolor="#777777">'."\n".
- '<table border="0"><tr bgcolor="#e6ffff">'."\n".
- '<td><b> Fullname </b></td>'."\n".
- '<td><b> Username </b></td>'."\n".
- '<td><b> Domain </b></td>';
- if ($receiptparts) {
- $string.='<td> Problem Part </td>';
- }
- $string.='</tr>'."\n".$contents.
- '</table></td></tr></table>'."\n";
+ '<p>'.
+ &mt('The above receipt matches the following [numerate,_1,student].',$matches).
+ '</p>'.
+ $header.
+ $contents.
+ &Apache::loncommon::end_data_table()."\n";
}
return $string.&show_grading_menu_form($symb);
}
@@ -695,17 +813,24 @@ sub listStudents {
my $cdom = $env{"course.$env{'request.course.id'}.domain"};
my $cnum = $env{"course.$env{'request.course.id'}.num"};
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
+ my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
-
my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
- my $result='<h3><span class="LC_info"> '.$viewgrade.
- ' Submissions for a Student or a Group of Students</span></h3>';
+ my $result='<h3><span class="LC_info"> '.
+ &mt($viewgrade.' Submissions for a Student or a Group of Students')
+ .'</span></h3>';
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
+ my %lt = ( '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.",
+ );
+ %lt = &Apache::lonlocal::texthash(%lt);
$request->print(<<LISTJAVASCRIPT);
<script type="text/javascript" language="javascript">
function checkSelect(checkBox) {
@@ -717,15 +842,15 @@ sub listStudents {
ctr++;
}
}
- sense = "a student or group of students";
+ sense = '$lt{'multiple'}';
} else {
if (checkBox.checked) {
ctr = 1;
}
- sense = "the student";
+ sense = '$lt{'single'}';
}
if (ctr == 0) {
- alert("Please select "+sense+" before clicking on the Next button.");
+ alert(sense);
return false;
}
document.gradesub.submit();
@@ -745,30 +870,49 @@ LISTJAVASCRIPT
my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
- "\n".$table.
- ' <b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
- '<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".
- '<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".
- ' <b>View Answer: </b><label><input type="radio" name="vAns" value="no" /> no </label>'."\n".
- '<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".
- '<label><input type="radio" name="vAns" value="all" checked="checked" /> all students </label><br />'."\n".
- ' <b>Submissions: </b>'."\n";
+ "\n".$table;
+
+ $gradeTable .=
+ ' '.
+ &mt('<b>View Problem Text: </b>[_1]',
+ '<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
+ '<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n".
+ '<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label>').'<br />'."\n";
+ $gradeTable .=
+ ' '.
+ &mt('<b>View Answer: </b>[_1]',
+ '<label><input type="radio" name="vAns" value="no" /> '.&mt('no').' </label>'."\n".
+ '<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n".
+ '<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label>').'<br />'."\n";
+
+ my $submission_options;
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
- $gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";
+ $submission_options.=
+ '<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> '.&mt('essay part only').' </label>'."\n";
}
-
- my $saveStatus = $env{'form.Status'} eq '' ? 'Active' : $env{'form.Status'};
+ my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
+ my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
$env{'form.Status'} = $saveStatus;
- $gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
- '<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
- '<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
- '<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n".
- ' <b>Grading Increments:</b> <select name="increment">'.
- '<option value="1">Whole Points</option>'.
- '<option value=".5">Half Points</option>'.
- '<option value=".25">Quarter Points</option>'.
- '<option value=".1">Tenths of a Point</option>'.
- '</select>'.
+ $submission_options.=
+ '<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.&mt('last submission only').' </label>'."\n".
+ '<label><input type="radio" name="lastSub" value="last" /> '.&mt('last submission & parts info').' </label>'."\n".
+ '<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".
+ '<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';
+ $gradeTable .=
+ ' '.
+ &mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n";
+
+ $gradeTable .=
+ ' '.
+ &mt('<b>Grading Increments:</b> [_1]',
+ '<select name="increment">'.
+ '<option value="1">'.&mt('Whole Points').'</option>'.
+ '<option value=".5">'.&mt('Half Points').'</option>'.
+ '<option value=".25">'.&mt('Quarter Points').'</option>'.
+ '<option value=".1">'.&mt('Tenths of a Point').'</option>'.
+ '</select>');
+
+ $gradeTable .=
&build_section_inputs().
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n".
@@ -779,45 +923,46 @@ LISTJAVASCRIPT
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
- $gradeTable.='<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n";
+ $gradeTable.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
} else {
- $gradeTable.='<b>Student Status:</b> '.
- &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
+ $gradeTable.=&mt('<b>Student Status:</b> [_1]',
+ &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';
}
- $gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
- 'next to the student\'s name(s). Then click on the Next button.<br />'."\n".
+ $gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
+ 'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n".
'<input type="hidden" name="command" value="processGroup" />'."\n";
# checkall buttons
$gradeTable.=&check_script('gradesub', 'stuinfo');
$gradeTable.='<input type="button" '."\n".
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
- 'value="Next->" /> <br />'."\n";
+ 'value="'.&mt('Next->').'" /> <br />'."\n";
$gradeTable.=&check_buttons();
- $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />Check For Plagiarism</label>';
- my ($classlist, undef, $fullname) = &getclasslist($getsec,'1');
- $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
- '<table border="0"><tr bgcolor="#e6ffff">';
+ $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>';
+ my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);
+ $gradeTable.= &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row();
my $loop = 0;
while ($loop < 2) {
- $gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'.
- '<td>'.&nameUserString('header').' Section/Group</td>';
+ $gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.
+ '<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>';
if ($env{'form.showgrading'} eq 'yes'
&& $submitonly ne 'queued'
&& $submitonly ne 'all') {
- foreach (sort(@$partlist)) {
- my $display_part=&get_display_part((split(/_/))[0],$symb);
- $gradeTable.='<td><b> Part: '.$display_part.
- ' Status </b></td>';
+ foreach my $part (sort(@$partlist)) {
+ my $display_part=
+ &get_display_part((split(/_/,$part))[0],$symb);
+ $gradeTable.=
+ '<th>'.&mt('Part: [_1] Status',$display_part).'</th>';
}
} elsif ($submitonly eq 'queued') {
- $gradeTable.='<td><b> '.&mt('Queue Status').' </b></td>';
+ $gradeTable.='<th>'.&mt('Queue Status').' </th>';
}
$loop++;
# $gradeTable.='<td></td>' if ($loop%2 ==1);
}
- $gradeTable.='</tr>'."\n";
+ $gradeTable.=&Apache::loncommon::end_data_table_header_row()."\n";
my $ctr = 0;
foreach my $student (sort
@@ -871,24 +1016,28 @@ LISTJAVASCRIPT
$ctr++;
my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
-
+ my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
if ( $perm{'vgr'} eq 'F' ) {
- $gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
+ if ($ctr%2 ==1) {
+ $gradeTable.= &Apache::loncommon::start_data_table_row();
+ }
$gradeTable.='<td align="right">'.$ctr.' </td>'.
'<td align="center"><label><input type=checkbox name="stuinfo" value="'.
$student.':'.$$fullname{$student}.':::SECTION'.$section.
') " /> </label></td>'."\n".'<td>'.
&nameUserString(undef,$$fullname{$student},$uname,$udom).
- ' '.$section.'</td>'."\n";
+ ' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (sort keys(%status)) {
- next if (/^resource.*?submitted_by$/);
- $gradeTable.='<td align="center"> '.$status{$_}.' </td>'."\n";
+ next if ($_ =~ /^resource.*?submitted_by$/);
+ $gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n";
}
}
# $gradeTable.='<td></td>' if ($ctr%2 ==1);
- $gradeTable.='</tr>'."\n" if ($ctr%2 ==0);
+ if ($ctr%2 ==0) {
+ $gradeTable.=&Apache::loncommon::end_data_table_row()."\n";
+ }
}
}
if ($ctr%2 ==1) {
@@ -902,28 +1051,29 @@ LISTJAVASCRIPT
} elsif ($submitonly eq 'queued') {
$gradeTable.='<td> </td>';
}
- $gradeTable.='</tr>';
+ $gradeTable.=&Apache::loncommon::end_data_table_row();
}
- $gradeTable.='</table></td></tr></table>'."\n".
+ $gradeTable.=&Apache::loncommon::end_data_table()."\n".
'<input type="button" '.
'onClick="javascript:checkSelect(this.form.stuinfo);" '.
- 'value="Next->" /></form>'."\n";
+ 'value="'.&mt('Next->').'" /></form>'."\n";
if ($ctr == 0) {
my $num_students=(scalar(keys(%$fullname)));
if ($num_students eq 0) {
- $gradeTable='<br /> <span class="LC_warning">There are no students currently enrolled.</span>';
+ $gradeTable='<br /> <span class="LC_warning">'.&mt('There are no students currently enrolled.').'</span>';
} else {
my $submissions='submissions';
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; }
if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; }
$gradeTable='<br /> <span class="LC_warning">'.
- 'No '.$submissions.' found for this resource for any students. ('.$num_students.
- ' students checked for '.$submissions.')</span><br />';
+ &mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')',
+ $num_students).
+ '</span><br />';
}
} elsif ($ctr == 1) {
- $gradeTable =~ s/type=checkbox/type=checkbox checked/;
+ $gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/;
}
$gradeTable.=&show_grading_menu_form($symb);
$request->print($gradeTable);
@@ -970,9 +1120,9 @@ sub check_script {
}
sub check_buttons {
- my $buttons.='<input type="button" onclick="checkall()" value="Check All" />';
- $buttons.='<input type="button" onclick="uncheckall()" value="Uncheck All" /> ';
- $buttons.='<input type="button" onclick="checksec()" value="Check Section/Group" />';
+ my $buttons.='<input type="button" onclick="checkall()" value="'.&mt('Check All').'" />';
+ $buttons.='<input type="button" onclick="uncheckall()" value="'.&mt('Uncheck All').'" /> ';
+ $buttons.='<input type="button" onclick="checksec()" value="'.&mt('Check Section/Group').'" />';
$buttons.='<input type="text" size="5" name="chksec" /> ';
return $buttons;
}
@@ -1375,43 +1525,43 @@ INNERJS
pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
- pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"</span></h3><br /><br />");
+ pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />");
pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
- pDoc.write("<td><b>Type</b></td><td><b>Include</b></td><td><b>Message</td></tr>");
+ pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>");
}
function displaySubject(msg,shwsel) {
pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
- pDoc.write("<td>Subject</td>");
- pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
- pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+ pDoc.write("<td>Subject<\\/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>");
}
function displaySavedMsg(ctr,msg,shwsel) {
pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
- pDoc.write("<td align=\\"center\\">"+ctr+"</td>");
- pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"></td>");
- pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"</textarea></td></tr>");
+ pDoc.write("<td align=\\"center\\">"+ctr+"<\\/td>");
+ pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
+ pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"<\\/textarea><\\/td><\\/tr>");
}
function newMsg(newmsg,shwsel) {
pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
- pDoc.write("<td align=\\"center\\">New</td>");
- pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
- pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"</textarea></td></tr>");
+ pDoc.write("<td align=\\"center\\">New<\\/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>");
}
function msgTail() {
pDoc = pWin.document;
- pDoc.write("</table>");
- pDoc.write("</td></tr></table> ");
+ pDoc.write("<\\/table>");
+ pDoc.write("<\\/td><\\/tr><\\/table> ");
pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\"> ");
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
- pDoc.write("</form>");
+ pDoc.write("<\\/form>");
pDoc.write('$end_page_msg_central');
pDoc.close();
}
@@ -1460,32 +1610,32 @@ INNERJS
hDoc.$docopen;
hDoc.write('$start_page_highlight_central');
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
- hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options</span></h3><br /><br />");
+ hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options<\\/span><\\/h3><br /><br />");
hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
- hDoc.write("<td><b>Text Color</b></td><td><b>Font Size</b></td><td><b>Font Style</td></tr>");
+ hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>");
}
function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) {
var hDoc = hwdWin.document;
hDoc.write("<tr bgcolor=\\"#ffffdd\\">");
hDoc.write("<td align=\\"left\\">");
- hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+"> "+clrtxt+"</td>");
+ hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+"> "+clrtxt+"<\\/td>");
hDoc.write("<td align=\\"left\\">");
- hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+"> "+sztxt+"</td>");
+ hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+"> "+sztxt+"<\\/td>");
hDoc.write("<td align=\\"left\\">");
- hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+"> "+sytxt+"</td>");
- hDoc.write("</tr>");
+ hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+"> "+sytxt+"<\\/td>");
+ hDoc.write("<\\/tr>");
}
function highlightend() {
var hDoc = hwdWin.document;
- hDoc.write("</table>");
- hDoc.write("</td></tr></table> ");
+ hDoc.write("<\\/table>");
+ hDoc.write("<\\/td><\\/tr><\\/table> ");
hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\"> ");
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
- hDoc.write("</form>");
+ hDoc.write("<\\/form>");
hDoc.write('$end_page_highlight_central');
hDoc.close();
}
@@ -1507,57 +1657,62 @@ sub get_increment {
sub gradeBox {
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
my $checkIcon = '<img alt="'.&mt('Check Mark').
- '" src="'.$request->dir_config('lonIconsURL').
- '/check.gif" height="16" border="0" />';
+ '" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
- my $wgtmsg = ($wgt > 0 ? '(problem weight)' :
- '<span class="LC_info">problem weight assigned by computer</span>');
+ my $wgtmsg = ($wgt > 0) ? &mt('(problem weight)')
+ : '<span class="LC_info">'.&mt('problem weight assigned by computer').'</span>';
$wgt = ($wgt > 0 ? $wgt : '1');
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
'' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
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'},
[$partid]);
my $aggtries = $$record{'resource.'.$partid.'.tries'};
if ($last_resets{$partid}) {
$aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
}
- $result.='<table border="0"><tr><td>'.
- '<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
+ $result.='<table border="0"><tr>';
my $ctr = 0;
my $thisweight = 0;
my $increment = &get_increment();
- $result.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across
+
+ my $radio.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across
while ($thisweight<=$wgt) {
- $result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+ $radio.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
$thisweight.')" value="'.$thisweight.'" '.
($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
- $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+ $radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
$thisweight += $increment;
$ctr++;
}
- $result.='</tr></table>';
- $result.='</td><td> <b>or</b> </td>'."\n";
- $result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
+ $radio.='</tr></table>';
+
+ my $line.='<input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','.
$wgt.')" /></td>'."\n";
- $result.='<td>/'.$wgt.' '.$wgtmsg.
+ $line.='<td>/'.$wgt.' '.$wgtmsg.
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : '').
' </td><td>'."\n";
- $result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
+ $line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
- $result.='<option></option>'.
- '<option selected="selected">excused</option>';
+ $line.='<option></option>'.
+ '<option value="excused" selected="selected">'.&mt('excused').'</option>';
} else {
- $result.='<option selected="selected"></option>'.
- '<option>excused</option>';
+ $line.='<option selected="selected"></option>'.
+ '<option value="excused" >'.&mt('excused').'</option>';
}
- $result.='<option>reset status</option></select>'."\n";
- $result.=" \n";
+ $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
+
+
+ $result .=
+ &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.='</tr></table>'."\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="solved'.$counter.'_'.$partid.'" value="'.
@@ -1566,7 +1721,6 @@ sub gradeBox {
$$record{'resource.'.$partid.'.tries'}.'" />'."\n".
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
$aggtries.'" />'."\n";
- $result.='</td></tr></table>'."\n";
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);
return $result;
}
@@ -1598,7 +1752,7 @@ sub handback_box {
'<span class="LC_filename">'.$file_disp.'</span>');
$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
- $result.='(File will be uploaded when you click on Save & Next below.)<br />';
+ $result.='('.&mt('File will be uploaded when you click on Save & Next below.').')<br />';
$file_counter++;
}
}
@@ -1634,27 +1788,27 @@ sub show_problem {
$companswer=~s|</form>||g;
$companswer=~s|name="submit"|name="would_have_been_submit"|g;
}
- my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
- $result.='<table border="0" width="100%">';
- if ($viewon) {
- $result.='<tr><td bgcolor="#e6ffff"><b> ';
- if ($mode eq 'both' or $mode eq 'text') {
- $result.='View of the problem - ';
- } else {
- $result.='Correct answer: ';
- }
- $result.=$env{'form.fullname'}.'</b></td></tr>';
- }
+ $rendered=
+ '<div class="LC_grade_show_problem_header">'.
+ &mt('View of the problem').
+ '</div><div class="LC_grade_show_problem_problem">'.
+ $rendered.
+ '</div>';
+ $companswer=
+ '<div class="LC_grade_show_problem_header">'.
+ &mt('Correct answer').
+ '</div><div class="LC_grade_show_problem_problem">'.
+ $companswer.
+ '</div>';
+ my $result;
if ($mode eq 'both') {
- $result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
- $result.='<b>Correct answer:</b><br />'.$companswer;
+ $result=$rendered.$companswer;
} elsif ($mode eq 'text') {
- $result.='<tr><td bgcolor="#ffffff">'.$rendered;
+ $result=$rendered;
} elsif ($mode eq 'answer') {
- $result.='<tr><td bgcolor="#ffffff">'.$companswer;
+ $result=$companswer;
}
- $result.='</td></tr></table>';
- $result.='</td></tr></table><br />';
+ $result='<div class="LC_grade_show_problem">'.$result.'</div>';
return $result;
}
@@ -1711,12 +1865,10 @@ sub build_section_inputs {
# --------------------------- show submissions of a student, option to grade
sub submission {
my ($request,$counter,$total) = @_;
-
my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
-
my $symb = &get_symb($request);
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
@@ -1746,14 +1898,8 @@ sub submission {
if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {
&download_all_link($request, $symb);
}
- $request->print('<h3> <span class="LC_info">Submission Record</span></h3>'."\n".
- '<h4> <b>Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n");
-
- if ($env{'form.handgrade'} eq 'no') {
- my $checkMark='<br /><br /> <b>Note:</b> Part(s) graded correct by the computer is marked with a '.
- $checkIcon.' symbol.'."\n";
- $request->print($checkMark);
- }
+ $request->print('<h3> <span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n".
+ '<h4> '.&mt('<b>Resource: </b> [_1]',$env{'form.probTitle'}).'</h4>'."\n");
# option to display problem, only once else it cause problems
# with the form later since the problem has a form.
@@ -1769,7 +1915,7 @@ sub submission {
&Apache::lonxml::clear_problem_counter();
$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
}
-
+
# kwclr is the only variable that is guaranteed to be non blank
# if this subroutine has been called once.
my %keyhash = ();
@@ -1788,10 +1934,11 @@ sub submission {
$env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
}
my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
+ my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
$request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n".
'<input type="hidden" name="command" value="handgrade" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
- '<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".
'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="refresh" value="off" />'."\n".
@@ -1854,8 +2001,14 @@ KEYWORDS
}
}
+# This is where output for one specific student would start
+ my $add_class = ($counter%2) ? 'LC_grade_show_user_odd_row' : '';
+ $request->print("\n\n".
+ '<div class="LC_grade_show_user '.$add_class.'">'.
+ '<div class="LC_grade_user_name">'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'</div>'.
+ '<div class="LC_grade_show_user_body">'."\n");
+
if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {
- $request->print('<br /><br /><br />') if ($counter > 0);
my $mode;
if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {
$mode='both';
@@ -1865,7 +2018,7 @@ KEYWORDS
$mode='answer';
}
&Apache::lonxml::clear_problem_counter();
- $request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode));
+ $request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode,{'request.prefix' => 'ctr'.$counter}));
}
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
@@ -1873,71 +2026,31 @@ KEYWORDS
# Display student info
$request->print(($counter == 0 ? '' : '<br />'));
- my $result='<table border="0" width="100%"><tr><td bgcolor="#777777">'."\n".
- '<table border="0" width="100%"><tr bgcolor="#edffff"><td>'."\n";
-
- $result.='<b>Fullname: </b>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'<br />'."\n";
+ my $result='<div class="LC_grade_submissions">';
+
+ $result.='<div class="LC_grade_submissions_header">';
+ $result.= &mt('Submissions');
$result.='<input type="hidden" name="name'.$counter.
'" value="'.$env{'form.fullname'}.'" />'."\n";
+ if ($env{'form.handgrade'} eq 'no') {
+ $result.='<span class="LC_grade_check_note">'.
+ &mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)."</span>\n";
+
+ }
+
+
# If any part of the problem is an essay-response (handgraded), then check for collaborators
- my @col_fullnames;
- my ($classlist,$fullname);
+ my $fullname;
+ my $col_fullnames = [];
if ($env{'form.handgrade'} eq 'yes') {
- ($classlist,undef,$fullname) = &getclasslist('all','0');
- for (keys (%$handgrade)) {
- my $ncol = &Apache::lonnet::EXT('resource.'.$_.
- '.maxcollaborators',
- $symb,$udom,$uname);
- next if ($ncol <= 0);
- s/\_/\./g;
- next if ($record{'resource.'.$_.'.collaborators'} eq '');
- my @goodcollaborators = ();
- my @badcollaborators = ();
- foreach (split(/,?\s+/,$record{'resource.'.$_.'.collaborators'})) {
- $_ =~ s/[\$\^\(\)]//g;
- next if ($_ eq '');
- my ($co_name,$co_dom) = split /\@|:/,$_;
- $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);
- next if ($co_name eq $uname && $co_dom eq $udom);
- # Doing this grep allows 'fuzzy' specification
- my @Matches = grep /^$co_name:$co_dom$/i,keys %$classlist;
- if (! scalar(@Matches)) {
- push @badcollaborators,$_;
- } else {
- push @goodcollaborators, @Matches;
- }
- }
- if (scalar(@goodcollaborators) != 0) {
- $result.='<b>Collaborators: </b>';
- foreach (@goodcollaborators) {
- my ($lastname,$givenn) = split(/,/,$$fullname{$_});
- push @col_fullnames, $givenn.' '.$lastname;
- $result.=$$fullname{$_}.' ';
- }
- $result.='<br />'."\n";
- my ($part)=split(/\./,$_);
- $result.='<input type="hidden" name="collaborator'.$counter.
- '" value="'.$part.':'.(join ':',@goodcollaborators).'" />'.
- "\n";
- }
- if (scalar(@badcollaborators) > 0) {
- $result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
- $result.='This student has submitted ';
- $result.=(scalar(@badcollaborators) == 1) ? 'an invalid collaborator' : 'invalid collaborators';
- $result .= ': '.join(', ',@badcollaborators);
- $result .= '</td></tr></table>';
- }
- if (scalar(@badcollaborators > $ncol)) {
- $result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>';
- $result .= 'This student has submitted too many '.
- 'collaborators. Maximum is '.$ncol.'.';
- $result .= '</td></tr></table>';
- }
- }
+ (my $sub_result,$fullname,$col_fullnames)=
+ &check_collaborators($symb,$uname,$udom,\%record,$handgrade,
+ $counter);
+ $result.=$sub_result;
}
$request->print($result."\n");
-
+ $request->print('</div>'."\n");
# print student answer/submission
# Options are (1) Handgaded submission only
# (2) Last submission, includes submission that is not handgraded
@@ -1946,12 +2059,14 @@ KEYWORDS
# (4) The whole record for this student
if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
my ($string,$timestamp)= &get_last_submission(\%record);
- my $lastsubonly=''.
- ($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
- $$timestamp)."</td></tr>\n";
+
+ my $lastsubonly;
+
if ($$timestamp eq '') {
- $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0];
+ $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>';
} else {
+ $lastsubonly = '<div class="LC_grade_submissions_body"> <b>Date Submitted:</b> '.$$timestamp."\n";
+
my %seenparts;
my @part_response_id = &flatten_responseType($responseType);
foreach my $part (@part_response_id) {
@@ -1974,16 +2089,16 @@ KEYWORDS
}
my $responsetype = $responseType->{$partid}->{$respid};
if (!exists($record{"resource.$partid.$respid.submission"})) {
- $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
+ $lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.
$display_part.' <span class="LC_internal_info">( ID '.$respid.
' )</span> '.
- '<span class="LC_warning">Nothing submitted - no attempts</span><br /><br />';
+ '<span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br /><br /></div>';
next;
}
- foreach (@$string) {
- my ($partid,$respid) = /^resource\.([^\.]*)\.([^\.]*)\.submission/;
+ foreach my $submission (@$string) {
+ my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
- my ($ressub,$subval) = split(/:/,$_,2);
+ my ($ressub,$subval) = split(/:/,$submission,2);
# Similarity check
my $similar='';
if($env{'form.checkPlag'}){
@@ -2013,31 +2128,32 @@ KEYWORDS
($env{'form.lastSub'} eq 'hdgrade' &&
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
my $display_part=&get_display_part($partid,$symb);
- $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
+ $lastsubonly.='<div class="LC_grade_submission_part"><b>Part:</b> '.
$display_part.' <span class="LC_internal_info">( ID '.$respid.
' )</span> ';
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
if (@$files) {
- $lastsubonly.='<br /><span class="LC_warning">Like all files provided by users, this file may contain virusses</span><br />';
+ $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain virusses').'</span><br />';
my $file_counter = 0;
foreach my $file (@$files) {
- $file_counter ++;
+ $file_counter++;
&Apache::lonnet::allowuploaded('/adm/grades',$file);
$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
}
$lastsubonly.='<br />';
}
- $lastsubonly.='<b>Submitted Answer: </b>'.
+ $lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
&cleanRecord($subval,$responsetype,$symb,$partid,
$respid,\%record,$order);
if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
+ $lastsubonly.='</div>';
}
}
}
+ $lastsubonly.='</div>'."\n";
}
- $lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
$request->print($lastsubonly);
- } elsif ($env{'form.lastSub'} eq 'datesub') {
+ } elsif ($env{'form.lastSub'} eq 'datesub') {
my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
} elsif ($env{'form.lastSub'} =~ /^(last|all)$/) {
@@ -2049,13 +2165,12 @@ KEYWORDS
$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
.$udom.'" />'."\n");
-
# return if view submission with no grading option
if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) {
my $toGrade.='<input type="button" value="Grade Student" '.
'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''
.$counter.'\');" target="_self" /> '."\n" if (&canmodify($usec));
- $toGrade.='</td></tr></table></td></tr></table>'."\n";
+ $toGrade.='</div>'."\n";
if (($env{'form.command'} eq 'submission') ||
($env{'form.command'} eq 'processGroup' && $counter == $total)) {
$toGrade.='</form>'.&show_grading_menu_form($symb);
@@ -2063,45 +2178,45 @@ KEYWORDS
$request->print($toGrade);
return;
} else {
- $request->print('</td></tr></table></td></tr></table>'."\n");
+ $request->print('</div>'."\n");
}
# essay grading message center
if ($env{'form.handgrade'} eq 'yes') {
+ my $result='<div class="LC_grade_message_center">';
+
+ $result.='<div class="LC_grade_message_center_header">'.
+ &mt('Send Message').'</div><div class="LC_grade_message_center_body">';
my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
my $msgfor = $givenn.' '.$lastname;
- if (scalar(@col_fullnames) > 0) {
- my $lastone = pop @col_fullnames;
- $msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
+ if (scalar(@$col_fullnames) > 0) {
+ my $lastone = pop(@$col_fullnames);
+ $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';
}
$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
- $result='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
+ $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
'<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.
',\''.$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>)'.
'<img src="'.$request->dir_config('lonIconsURL').
'/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
'<br /> ('.
- &mt('Message will be sent when you click on Save & Next below.').")\n";
+ &mt('Message will be sent when you click on Save & Next below.').")\n";
+ $result.='</div></div>';
$request->print($result);
}
- if ($perm{'vgr'}) {
- $request->print('<br />'.
- &Apache::loncommon::track_student_link(&mt('View recent activity'),
- $uname,$udom,'check'));
- }
- if ($perm{'opa'}) {
- $request->print('<br />'.
- &Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
- $uname,$udom,$symb,'check'));
- }
my %seen = ();
my @partlist;
my @gradePartRespid;
my @part_response_id = &flatten_responseType($responseType);
+ $request->print('<div class="LC_grade_assign">'.
+
+ '<div class="LC_grade_assign_header">'.
+ &mt('Assign Grades').'</div>'.
+ '<div class="LC_grade_assign_body">');
foreach my $part_response_id (@part_response_id) {
my ($partid,$respid) = @{ $part_response_id };
my $part_resp = join('_',@{ $part_response_id });
@@ -2113,6 +2228,21 @@ KEYWORDS
push @gradePartRespid,$partid.'.'.$respid;
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
}
+ $request->print('</div></div>');
+
+ $request->print('<div class="LC_grade_info_links">');
+ if ($perm{'vgr'}) {
+ $request->print(
+ &Apache::loncommon::track_student_link(&mt('View recent activity'),
+ $uname,$udom,'check'));
+ }
+ if ($perm{'opa'}) {
+ $request->print(
+ &Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
+ $uname,$udom,$symb,'check'));
+ }
+ $request->print('</div>');
+
$result='<input type="hidden" name="partlist'.$counter.
'" value="'.(join ":",@partlist).'" />'."\n";
$result.='<input type="hidden" name="gradePartRespid'.
@@ -2123,12 +2253,18 @@ KEYWORDS
$partlist[$ctr].'" />'."\n";
$ctr++;
}
- $request->print($result.'</td></tr></table></td></tr></table>'."\n");
+ $request->print($result.''."\n");
+
+# Done with printing info for one student
+
+ $request->print('</div>');#LC_grade_show_user_body
+ $request->print('</div>');#LC_grade_show_user
+
# print end of form
if ($counter == $total) {
my $endform='<table border="0"><tr><td>'."\n";
- $endform.='<input type="button" value="Save & Next" '.
+ $endform.='<input type="button" value="'.&mt('Save & Next').'" '.
'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
$total.','.scalar(@partlist).');" target="_self" /> '."\n";
my $ntstu ='<select name="NTSTU">'.
@@ -2137,21 +2273,77 @@ KEYWORDS
'<option>7</option><option>10</option></select>'."\n";
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
- $endform.=$ntstu.'student(s) ';
- $endform.='<input type="button" value="Previous" '.
+ $endform.=&mt('[_1]student(s)',$ntstu);
+ $endform.=' <input type="button" value="'.&mt('Previous').'" '.
'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> '."\n".
- '<input type="button" value="Next" '.
+ '<input type="button" value="'.&mt('Next').'" '.
'onClick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> ';
- $endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
+ $endform.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ;
$endform.="<input type='hidden' value='".&get_increment().
"' name='increment' />";
- $endform.='</td><tr></table></form>';
+ $endform.='</td></tr></table></form>';
$endform.=&show_grading_menu_form($symb);
$request->print($endform);
}
return '';
}
+sub check_collaborators {
+ my ($symb,$uname,$udom,$record,$handgrade,$counter) = @_;
+ my ($result,@col_fullnames);
+ my ($classlist,undef,$fullname) = &getclasslist('all','0');
+ foreach my $part (keys(%$handgrade)) {
+ my $ncol = &Apache::lonnet::EXT('resource.'.$part.
+ '.maxcollaborators',
+ $symb,$udom,$uname);
+ next if ($ncol <= 0);
+ $part =~ s/\_/\./g;
+ next if ($record->{'resource.'.$part.'.collaborators'} eq '');
+ my (@good_collaborators, @bad_collaborators);
+ foreach my $possible_collaborator
+ (split(/,?\s+/,$record->{'resource.'.$part.'.collaborators'})) {
+ $possible_collaborator =~ s/[\$\^\(\)]//g;
+ next if ($possible_collaborator eq '');
+ my ($co_name,$co_dom) = split(/\@|:/,$possible_collaborator);
+ $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);
+ next if ($co_name eq $uname && $co_dom eq $udom);
+ # Doing this grep allows 'fuzzy' specification
+ my @matches = grep(/^\Q$co_name\E:\Q$co_dom\E$/i,
+ keys(%$classlist));
+ if (! scalar(@matches)) {
+ push(@bad_collaborators, $possible_collaborator);
+ } else {
+ push(@good_collaborators, @matches);
+ }
+ }
+ if (scalar(@good_collaborators) != 0) {
+ $result.='<br />'.&mt('Collaborators: ');
+ foreach my $name (@good_collaborators) {
+ my ($lastname,$givenn) = split(/,/,$$fullname{$name});
+ push(@col_fullnames, $givenn.' '.$lastname);
+ $result.=$fullname->{$name}.' ';
+ }
+ $result.='<br />'."\n";
+ my ($part)=split(/\./,$part);
+ $result.='<input type="hidden" name="collaborator'.$counter.
+ '" value="'.$part.':'.(join ':',@good_collaborators).'" />'.
+ "\n";
+ }
+ if (scalar(@bad_collaborators) > 0) {
+ $result.='<div class="LC_warning">';
+ $result.=&mt('This student has submitted [quant,_1,invalid collaborator]: [_2]',scalar(@bad_collaborators),join(', ',@bad_collaborators));
+ $result .= '</div>';
+ }
+ if (scalar(@bad_collaborators > $ncol)) {
+ $result .= '<div class="LC_warning">';
+ $result .= &mt('This student has submitted too many '.
+ 'collaborators. Maximum is [_1].',$ncol);
+ $result .= '</div>';
+ }
+ }
+ return ($result,$fullname,\@col_fullnames);
+}
+
#--- Retrieve the last submission for all the parts
sub get_last_submission {
my ($returnhash)=@_;
@@ -2428,9 +2620,9 @@ sub processHandGrade {
$ctr++;
}
if ($total < 0) {
- my $the_end = '<h3><span class="LC_info">LON-CAPA User Message</span></h3><br />'."\n";
- $the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
- $the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
+ my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";
+ $the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n";
+ $the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";
$the_end.=&show_grading_menu_form($symb);
$request->print($the_end);
}
@@ -2787,7 +2979,6 @@ sub version_selected_portfile {
my $new_answer;
$env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name");
if($env{'form.copy'} eq '-1') {
- &Apache::lonnet::logthis('problem getting file '.$file_name);
$new_answer = 'problem getting file';
} else {
$new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
@@ -3002,38 +3193,39 @@ sub viewgrades {
&Apache::lonnet::clear_EXT_cache_status();
my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';
- $result.='<h4><b>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
$result.=&jscriptNform($symb);
#beginning of class grading form
+ my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
$result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="command" value="editgrades" />'."\n".
&build_section_inputs().
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
- '<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
my $sectionClass;
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
if ($env{'form.section'} eq 'all') {
- $sectionClass='Class </h3>';
+ $sectionClass='Class';
} elsif ($env{'form.section'} eq 'none') {
- $sectionClass=&mt('Students in no Section').'</h3>';
+ $sectionClass='Students in no Section';
} else {
- $sectionClass=&mt('Students in Section(s) [_1]',$section_display).'</h3>';
+ $sectionClass='Students in Section(s) [_1]';
}
- $result.='<h3>'.&mt('Assign Common Grade To [_1]',$sectionClass);
- $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
- '<table border=0><tr bgcolor="#ffffdd"><td>';
+ $result.=
+ '<h3>'.
+ &mt("Assign Common Grade To $sectionClass",$section_display).'</h3>';
+ $result.= &Apache::loncommon::start_data_table();
#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem
my ($partlist,$handgrade,$responseType) = &response_type($symb);
my %weight = ();
my $ctsparts = 0;
- $result.='<table border="0">';
my %seen = ();
my @part_response_id = &flatten_responseType($responseType);
foreach my $part_response_id (@part_response_id) {
@@ -3045,46 +3237,53 @@ sub viewgrades {
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
$weight{$partid} = $wgt eq '' ? '1' : $wgt;
- $result.='<input type="hidden" name="partid_'.
- $ctsparts.'" value="'.$partid.'" />'."\n";
- $result.='<input type="hidden" name="weight_'.
- $partid.'" value="'.$weight{$partid}.'" />'."\n";
my $display_part=&get_display_part($partid,$symb);
- $result.='<tr><td><b>Part:</b> '.$display_part.' <b>Point:</b> </td><td>';
- $result.='<table border="0"><tr>';
+ my $radio.='<table border="0"><tr>';
my $ctr = 0;
while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
- $result.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.
+ $radio.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.
'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}.
','.$ctr.')" />'.$ctr."</label></td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
$ctr++;
}
- $result.='</tr></table>';
- $result.= '</td><td><b> or </b><input type="text" name="TEXTVAL_'.
+ $radio.='</tr></table>';
+ my $line = '<input type="text" name="TEXTVAL_'.
$partid.'" size="4" '.'onChange="javascript:writePoint(\''.
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
$weight{$partid}.' (problem weight)</td>'."\n";
- $result.= '</td><td><select name="SELVAL_'.$partid.'"'.
+ $line.= '<td><select name="SELVAL_'.$partid.'"'.
'onChange="javascript:writeRadText(\''.$partid.'\','.
$weight{$partid}.')"> '.
'<option selected="selected"> </option>'.
- '<option>excused</option>'.
- '<option>reset status</option></select></td>'.
- '<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n";
+ '<option value="excused">'.&mt('excused').'</option>'.
+ '<option value="reset status">'.&mt('reset status').'</option>'.
+ '</select></td>'.
+ '<td><label><input type="checkbox" name="FORCE_'.$partid.'" />'.&mt('Override "Correct"').'</label>';
+ $line.='<input type="hidden" name="partid_'.
+ $ctsparts.'" value="'.$partid.'" />'."\n";
+ $line.='<input type="hidden" name="weight_'.
+ $partid.'" value="'.$weight{$partid}.'" />'."\n";
+
+ $result.=
+ &Apache::loncommon::start_data_table_row()."\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).
+ &Apache::loncommon::end_data_table_row()."\n";
$ctsparts++;
}
- $result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
+ $result.=&Apache::loncommon::end_data_table()."\n".
'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
- $result.='<input type="button" value="Revert to Default" '.
- 'onClick="javascript:resetEntry('.$ctsparts.');" target="_self" />';
+ $result.='<input type="button" value="'.&mt('Revert to Default').'" '.
+ 'onClick="javascript:resetEntry('.$ctsparts.');" />';
#table listing all the students in a section/class
#header of table
- $result.= '<h3>Assign Grade to Specific Students in '.$sectionClass;
- $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
- '<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'.
- '<td>'.&nameUserString('header')."</td>\n";
+ $result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass,
+ $section_display).'</h3>';
+ $result.= &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th>'.&mt('No.').'</th>'.
+ '<th>'.&nameUserString('header')."</th>\n";
my (@parts) = sort(&getpartlist($symb));
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
my @partids = ();
@@ -3096,16 +3295,23 @@ sub viewgrades {
push(@partids, $partid);
my $display_part=&get_display_part($partid,$symb);
if ($display =~ /^Partial Credit Factor/) {
- $result.='<td><b>Score Part:</b> '.$display_part.
- ' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";
+ $result.='<th>'.
+ &mt('Score Part: [_1]<br /> (weight = [_2])',
+ $display_part,$weight{$partid}).'</th>'."\n";
next;
+
} else {
- $display =~s/\[Part: \Q$partid\E\]/Part:<\/b> $display_part/;
+ if ($display =~ /Problem Status/) {
+ my $grade_status_mt = &mt('Grade Status');
+ $display =~ s{Problem Status}{$grade_status_mt<br />};
+ }
+ my $part_mt = &mt('Part:');
+ $display =~s{\[Part: \Q$partid\E\]}{$part_mt $display_part};
}
- $display =~ s|Problem Status|Grade Status<br />|;
- $result.='<td><b>'.$display.'</td>'."\n";
+
+ $result.='<th>'.$display.'</th>'."\n";
}
- $result.='</tr>';
+ $result.=&Apache::loncommon::end_data_table_header_row();
my %last_resets =
&get_last_resets($symb,$env{'request.course.id'},\@partids);
@@ -3125,16 +3331,17 @@ sub viewgrades {
$result.=&viewstudentgrade($symb,$env{'request.course.id'},
$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
}
- $result.='</table></td></tr></table>';
+ $result.=&Apache::loncommon::end_data_table();
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
- $result.='<input type="button" value="Save" '.
+ $result.='<input type="button" value="'.&mt('Save').'" '.
'onClick="javascript:submit();" target="_self" /></form>'."\n";
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'));
$result='<span class="LC_warning">'.
- &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade',
- $section_display, $env{'form.Status'}).
+ &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
+ $section_display, $stu_status).
'</span>';
}
$result.=&show_grading_menu_form($symb);
@@ -3147,7 +3354,7 @@ sub viewstudentgrade {
my ($uname,$udom) = split(/:/,$student);
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
my %aggregates = ();
- my $result='<tr bgcolor="#ffffdd"><td align="right">'.
+ my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'.
'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.
"\n".$ctr.' </td><td> '.
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
@@ -3189,9 +3396,9 @@ sub viewstudentgrade {
$result.=' <select name="'.
'GD_'.$student.'_'.$part.'_solved" '.
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
- $result.= (($status eq 'excused') ? '<option> </option><option selected="selected">excused</option>'
- : '<option selected="selected"> </option><option>excused</option>')."\n";
- $result.='<option>reset status</option>';
+ $result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>'
+ : '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n";
+ $result.='<option value="reset status">'.&mt('reset status').'</option>';
$result.="</select> </td>\n";
} else {
$result.='<input type="hidden" name="'.
@@ -3202,7 +3409,7 @@ sub viewstudentgrade {
'value="'.$score.'" size="4" /></td>'."\n";
}
}
- $result.='</tr>';
+ $result.=&Apache::loncommon::end_data_table_row();
return $result;
}
@@ -3213,15 +3420,14 @@ sub editgrades {
my $symb=&get_symb($request);
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
- my $title='<h3><span class="LC_info">'.&mt('Current Grade Status').'</span></h3>';
- $title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4><br />'."\n";
+ my $title='<h2>'.&mt('Current Grade Status').'</h2>';
+ $title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";
$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n";
- my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
- $result.= '<table border="0"><tr bgcolor="#deffff">'.
- '<td rowspan=2 valign="center"> <b>No.</b> </td>'.
- '<td rowspan=2 valign="center">'.&nameUserString('header')."</td>\n";
-
+ my $result= &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th rowspan="2" valign="middle">'.&mt('No.').'</th>'.
+ '<th rowspan="2" valign="middle">'.&nameUserString('header')."</th>\n";
my %scoreptr = (
'correct' =>'correct_by_override',
'incorrect'=>'incorrect_by_override',
@@ -3246,8 +3452,8 @@ sub editgrades {
}
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
foreach my $partid (@partid) {
- $header .= '<td align="center"> <b>Old Score</b> </td>'.
- '<td align="center"> <b>New Score</b> </td>';
+ $header .= '<th align="center">'.&mt('Old Score').'</th>'.
+ '<th align="center">'.&mt('New Score').'</th>';
$columns{$partid}=2;
foreach my $stores (@parts) {
my ($part,$type) = &split_part_type($stores);
@@ -3256,22 +3462,23 @@ sub editgrades {
my $display=&Apache::lonnet::metadata($url,$stores.'.display');
$display =~ s/\[Part: (\w)+\]//;
$display =~ s/Number of Attempts/Tries/;
- $header .= '<td align="center"> <b>Old '.$display.'</b> </td>'.
- '<td align="center"> <b>New '.$display.'</b> </td>';
+ $header .= '<th align="center">'.&mt('Old '.$display).'</th>'.
+ '<th align="center">'.&mt('New '.$display).'</th>';
$columns{$partid}+=2;
}
}
foreach my $partid (@partid) {
my $display_part=&get_display_part($partid,$symb);
- $result .= '<td colspan="'.$columns{$partid}.
- '" align="center"><b>Part:</b> '.$display_part.
- ' (Weight = '.$weight{$partid}.')</td>';
+ $result .= '<th colspan="'.$columns{$partid}.'" align="center">'.
+ &mt('Part: [_1] (Weight = [_2])',$display_part,$weight{$partid}).
+ '</th>';
}
- $result .= '</tr><tr bgcolor="#deffff">';
- $result .= $header;
- $result .= '</tr>'."\n";
- my $noupdate;
+ $result .= &Apache::loncommon::end_data_table_header_row().
+ &Apache::loncommon::start_data_table_header_row().
+ $header.
+ &Apache::loncommon::end_data_table_header_row();
+ my @noupdate;
my ($updateCtr,$noupdateCtr) = (1,1);
for ($i=0; $i<$env{'form.total'}; $i++) {
my $line;
@@ -3283,7 +3490,9 @@ sub editgrades {
my $usec=$classlist->{"$uname:$udom"}[5];
if (!&canmodify($usec)) {
my $numcols=scalar(@partid)*4+2;
- $noupdate.=$line."<td colspan=\"$numcols\"><span class=\"LC_warning\">Not allowed to modify student</span></td></tr>";
+ push(@noupdate,
+ $line."<td colspan=\"$numcols\"><span class=\"LC_warning\">".
+ &mt('Not allowed to modify student')."</span></td></tr>");
next;
}
my %aggregate = ();
@@ -3352,7 +3561,7 @@ sub editgrades {
'<td align="center">'.$awarded.' </td>';
}
}
- $line.='</tr>'."\n";
+ $line.="\n";
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -3385,10 +3594,13 @@ sub editgrades {
}
}
- $result.='<tr bgcolor="#ffffde"><td align="right"> '.$updateCtr.' </td>'.$line;
+ $result.=&Apache::loncommon::start_data_table_row().
+ '<td align="right"> '.$updateCtr.' </td>'.$line.
+ &Apache::loncommon::end_data_table_row();
$updateCtr++;
} else {
- $noupdate.='<tr bgcolor="#ffffde"><td align="right"> '.$noupdateCtr.' </td>'.$line;
+ push(@noupdate,
+ '<td align="right"> '.$noupdateCtr.' </td>'.$line);
$noupdateCtr++;
}
if ($aggregateflag) {
@@ -3396,16 +3608,28 @@ sub editgrades {
$cdom,$cnum);
}
}
- if ($noupdate) {
+ if (@noupdate) {
# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
my $numcols=scalar(@partid)*4+2;
- $result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate;
- }
- $result .= '</table></td></tr></table>'."\n".
- &show_grading_menu_form ($symb);
- my $msg = '<br /><b>Number of records updated = '.$rec_update.
- ' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.
- '<b>Total number of students = '.$env{'form.total'}.'</b><br />';
+ $result .= &Apache::loncommon::start_data_table_row('LC_empty_row').
+ '<td align="center" colspan="'.$numcols.'">'.
+ &mt('No Changes Occurred For the Students Below').
+ '</td>'.
+ &Apache::loncommon::end_data_table_row();
+ foreach my $line (@noupdate) {
+ $result.=
+ &Apache::loncommon::start_data_table_row().
+ $line.
+ &Apache::loncommon::end_data_table_row();
+ }
+ }
+ $result .= &Apache::loncommon::end_data_table().
+ &show_grading_menu_form($symb);
+ my $msg = '<p><b>'.
+ &mt('Number of records updated = [_1] for [quant,_2,student].',
+ $rec_update,$count).'</b><br />'.
+ '<b>'.&mt('Total number of students = [_1]',$env{'form.total'}).
+ '</b></p>';
return $title.$msg.$result;
}
@@ -3413,7 +3637,7 @@ sub split_part_type {
my ($partstr) = @_;
my ($temp,@allparts)=split(/_/,$partstr);
my $type=pop(@allparts);
- my $part=join('.',@allparts);
+ my $part=join('_',@allparts);
return ($part,$type);
}
@@ -3797,7 +4021,8 @@ sub csvuploadassign {
if ($wgt) {
$entries{$fields{$dest}}=~s/\s//g;
my $pcr=$entries{$fields{$dest}} / $wgt;
- my $award='correct_by_override';
+ my $award=($pcr == 0) ? 'incorrect_by_override'
+ : 'correct_by_override';
$grades{"resource.$part.awarded"}=$pcr;
$grades{"resource.$part.solved"}=$award;
$points{$part}=1;
@@ -3819,7 +4044,6 @@ sub csvuploadassign {
}
if (! %grades) { push(@skipped,"$username:$domain no data to save"); }
$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
-# &Apache::lonnet::logthis(" storing ".(join('-',%grades)));
my $result=&Apache::lonnet::cstore(\%grades,$symb,
$env{'request.course.id'},
$domain,$username);
@@ -3882,23 +4106,25 @@ LISTJAVASCRIPT
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
my $result='<h3><span class="LC_info"> '.
- 'Manual Grading by Page or Sequence</span></h3>';
+ &mt('Manual Grading by Page or Sequence').'</span></h3>';
$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
- $result.=' <b>Problems from:</b> <select name="selectpage">'."\n";
my ($titles,$symbx) = &getSymbMap();
my ($curpage) =&Apache::lonnet::decode_symb($symb);
# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);
# my $type=($curpage =~ /\.(page|sequence)/);
+ my $select = '<select name="selectpage">'."\n";
my $ctr=0;
foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
- $result.='<option value="'.$ctr.'" '.
+ $select.='<option value="'.$ctr.'" '.
($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
'>'.$showtitle.'</option>'."\n";
$ctr++;
}
- $result.= '</select>'."<br />\n";
+ $select.= '</select>';
+ $result.=&mt(' <b>Problems from:</b> [_1]',$select)."<br />\n";
+
$ctr=0;
foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
@@ -3909,35 +4135,41 @@ LISTJAVASCRIPT
$result.='<input type="hidden" name="page" />'."\n".
'<input type="hidden" name="title" />'."\n";
- $result.=' <b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
- '<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";
-
- $result.=' <b>Submission Details: </b>'.
- '<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n".
- '<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> by dates and submissions</label>'."\n".
- '<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n";
+ my $options =
+ '<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
+ '<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n";
+ $result.=' '.&mt('<b>View Problems Text: </b> [_1]',$options);
+
+ $options =
+ '<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n".
+ '<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n".
+ '<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n";
+ $result.=' '.&mt('<b>Submission Details: </b>[_1]',$options);
$result.=&build_section_inputs();
- $result.='<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
+ my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
+ $result.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".
'<input type="hidden" name="command" value="displayPage" />'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
- $result.=' <b>'.&mt('Use CODE:').' </b>'.
- '<input type="text" name="CODE" value="" /><br />'."\n";
+ $result.=' '.&mt('<b>Use CODE: [_1] </b>',
+ '<input type="text" name="CODE" value="" />').
+ '<br />'."\n";
$result.=' <input type="button" '.
- 'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
+ 'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next->').'" /><br />'."\n";
$request->print($result);
- my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br />'.
- '<table border="0"><tr><td bgcolor="#777777">'.
- '<table border="0"><tr bgcolor="#e6ffff">'.
- '<td align="right"> <b>No.</b></td>'.
- '<td>'.&nameUserString('header').'</td>'.
- '<td align="right"> <b>No.</b></td>'.
- '<td>'.&nameUserString('header').'</td></tr>';
+ my $studentTable.=' <b>'.&mt('Select a student you wish to grade and then click on the Next button.').'</b><br />'.
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th align="right"> '.&mt('No.').'</th>'.
+ '<th>'.&nameUserString('header').'</th>'.
+ '<th align="right"> '.&mt('No.').'</th>'.
+ '<th>'.&nameUserString('header').'</th>'.
+ &Apache::loncommon::end_data_table_header_row();
my (undef,undef,$fullname) = &getclasslist($getsec,'1');
my $ptr = 1;
@@ -3949,17 +4181,23 @@ LISTJAVASCRIPT
return $a cmp $b;
} (keys(%$fullname))) {
my ($uname,$udom) = split(/:/,$student);
- $studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');
+ $studentTable.=($ptr%2==1 ? &Apache::loncommon::start_data_table_row()
+ : '</td>');
$studentTable.='<td align="right">'.$ptr.' </td>';
$studentTable.='<td> <label><input type="radio" name="student" value="'.$student.'" /> '
.&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n";
- $studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
+ $studentTable.=
+ ($ptr%2 == 0 ? '</td>'.&Apache::loncommon::end_data_table_row()
+ : '');
$ptr++;
}
- $studentTable.='</td><td> </td><td> </td></tr>' if ($ptr%2 == 0);
- $studentTable.='</table></td></tr></table>'."\n";
+ if ($ptr%2 == 0) {
+ $studentTable.='</td><td> </td><td> </td>'.
+ &Apache::loncommon::end_data_table_row();
+ }
+ $studentTable.=&Apache::loncommon::end_data_table()."\n";
$studentTable.='<input type="button" '.
- 'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
+ 'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next->').'" /></form>'."\n";
$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);
@@ -4011,15 +4249,15 @@ sub displayPage {
&Apache::lonnet::clear_EXT_cache_status();
if (!&canview($usec)) {
- $request->print('<span class="LC_warning">Unable to view requested student.('.$env{'form.student'}.')</span>');
+ $request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>');
$request->print(&show_grading_menu_form($symb));
return;
}
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>';
- $result.='<h3> Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
+ $result.='<h3> '.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).
'</h3>'."\n";
if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
- $result.='<h3> CODE: '.$env{'form.CODE'}.'</h3>'."\n";
+ $result.='<h3> '.&mt('CODE: [_1]',$env{'form.CODE'}).'</h3>'."\n";
} else {
delete($env{'form.CODE'});
}
@@ -4030,7 +4268,7 @@ sub displayPage {
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {
- $request->print('<span class="LC_warning">Unable to view requested sequence. ('.$resUrl.')</span>');
+ $request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>');
$request->print(&show_grading_menu_form($symb));
return;
}
@@ -4052,15 +4290,14 @@ sub displayPage {
'<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n";
}
my $checkIcon = '<img alt="'.&mt('Check Mark').
- '" src="'.$request->dir_config('lonIconsURL').
- '/check.gif" height="16" border="0" />';
+ '" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
- $studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
- ' symbol.'."\n".
- '<table border="0"><tr><td bgcolor="#777777">'.
- '<table border="0"><tr bgcolor="#e6ffff">'.
- '<td align="center"><b> Prob. </b></td>'.
- '<td><b> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
+ $studentTable.=' '.&mt('<b>Note:</b> Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n".
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th align="center"> Prob. </th>'.
+ '<th> '.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'.
+ &Apache::loncommon::end_data_table_header_row();
&Apache::lonxml::clear_problem_counter();
my ($depth,$question,$prob) = (1,1,1);
@@ -4074,8 +4311,14 @@ sub displayPage {
my $parts = $curRes->parts();
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
- $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
- (scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';
+ $studentTable.=
+ &Apache::loncommon::start_data_table_row().
+ '<td align="center" valign="top" >'.$prob.
+ (scalar(@{$parts}) == 1 ? ''
+ : '<br />('.&mt('[_1] parts)',
+ scalar(@{$parts}))
+ ).
+ '</td>';
$studentTable.='<td valign="top">';
my %form = ('CODE' => $env{'form.CODE'},);
if ($env{'form.vProb'} eq 'yes' ) {
@@ -4090,14 +4333,14 @@ sub displayPage {
# $request->print('match='.$1."<br />\n");
# }
# $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
- $studentTable.=' <b>'.$title.'</b> <br /> <b>Correct answer:</b><br />'.$companswer;
+ $studentTable.=' <b>'.$title.'</b> <br /> '.&mt('<b>Correct answer:</b><br />[_1]',$companswer);
}
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
if ($env{'form.lastSub'} eq 'datesub') {
if ($record{'version'} eq '') {
- $studentTable.='<br /> <span class="LC_warning">No recorded submission for this problem</span><br />';
+ $studentTable.='<br /> <span class="LC_warning">'.&mt('No recorded submission for this problem.').'</span><br />';
} else {
my %responseType = ();
foreach my $partid (@{$parts}) {
@@ -4133,8 +4376,8 @@ sub displayPage {
$curRes = $iterator->next();
}
- $studentTable.='</table></td></tr></table>'."\n".
- '<input type="button" value="Save" '.
+ $studentTable.='</table>'."\n".
+ '<input type="button" value="'.&mt('Save').'" '.
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
'</form>'."\n";
$studentTable.=&show_grading_menu_form($symb);
@@ -4148,31 +4391,33 @@ sub displaySubByDates {
my $isCODE=0;
my $isTask = ($symb =~/\.task$/);
if (exists($record->{'resource.CODE'})) { $isCODE=1; }
- my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
- '<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
- '<td><b>Date/Time</b></td>'.
- ($isCODE?'<td><b>CODE</b></td>':'').
- '<td><b>Submission</b></td>'.
- '<td><b>Status </b></td></tr>';
+ my $studentTable=&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th>'.&mt('Date/Time').'</th>'.
+ ($isCODE?'<th>'.&mt('CODE').'</th>':'').
+ '<th>'.&mt('Submission').'</th>'.
+ '<th>'.&mt('Status').'</th>'.
+ &Apache::loncommon::end_data_table_header_row();
my ($version);
my %mark;
my %orders;
$mark{'correct_by_student'} = $checkIcon;
if (!exists($$record{'1:timestamp'})) {
- return '<br /> <span class="LC_warning">Nothing submitted - no attempts</span><br />';
+ return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br />';
}
my $interaction;
for ($version=1;$version<=$$record{'version'};$version++) {
- my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
+ my $timestamp =
+ &Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
if (exists($$record{$version.':resource.0.version'})) {
$interaction = $$record{$version.':resource.0.version'};
}
my $where = ($isTask ? "$version:resource.$interaction"
: "$version:resource");
- #&Apache::lonnet::logthis(" got $where");
- $studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
+ $studentTable.=&Apache::loncommon::start_data_table_row().
+ '<td>'.$timestamp.'</td>';
if ($isCODE) {
$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
}
@@ -4191,15 +4436,14 @@ sub displaySubByDates {
my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
- #&Apache::lonnet::logthis("match $matchKey $responseId (".$$record{$version.':'.$matchKey});
- $displaySub[0].='<b>Part:</b> '.$display_part.' ';
- $displaySub[0].='<span class="LC_internal_info">(ID '.
+ $displaySub[0].='<b>'.&mt('Part:').'</b> '.$display_part.' ';
+ $displaySub[0].='<span class="LC_internal_info">('.&mt('ID').' '.
$responseId.')</span> <b>';
if ($$record{"$where.$partid.tries"} eq '') {
- $displaySub[0].='Trial not counted';
+ $displaySub[0].=&mt('Trial not counted');
} else {
- $displaySub[0].='Trial '.
- $$record{"$where.$partid.tries"};
+ $displaySub[0].=&mt('Trial [_1]',
+ $$record{"$where.$partid.tries"});
}
my $responseType=($isTask ? 'Task'
: $responseType->{$partid}->{$responseId});
@@ -4213,13 +4457,13 @@ sub displaySubByDates {
}
}
if (exists($$record{"$where.$partid.checkedin"})) {
- $displaySub[1].='Checked in by '.
- $$record{"$where.$partid.checkedin"}.' into slot '.
- $$record{"$where.$partid.checkedin.slot"}.
- '<br />';
+ $displaySub[1].=&mt('Checked in by [_1] into slot [_2]',
+ $$record{"$where.$partid.checkedin"},
+ $$record{"$where.$partid.checkedin.slot"}).
+ '<br />';
}
if (exists $$record{"$where.$partid.award"}) {
- $displaySub[1].='<b>Part:</b> '.$display_part.' '.
+ $displaySub[1].='<b>'.&mt('Part:').'</b> '.$display_part.' '.
lc($$record{"$where.$partid.award"}).' '.
$mark{$$record{"$where.$partid.solved"}}.
'<br />';
@@ -4239,12 +4483,12 @@ sub displaySubByDates {
}
$studentTable.='<td>'.$displaySub[0].' </td><td>'.$displaySub[1];
if ($displaySub[2]) {
- $studentTable.='Manually graded by '.$displaySub[2];
+ $studentTable.=&mt('Manually graded by [_1]',$displaySub[2]);
}
- $studentTable.=' </td></tr>';
-
+ $studentTable.=' </td>'.
+ &Apache::loncommon::end_data_table_row();
}
- $studentTable.='</table></td></tr></table>';
+ $studentTable.=&Apache::loncommon::end_data_table();
return $studentTable;
}
@@ -4281,12 +4525,14 @@ sub updateGradeByPage {
my $iterator = $navmap->getIterator($map->map_start(),
$map->map_finish());
- my $studentTable='<table border="0"><tr><td bgcolor="#777777">'.
- '<table border="0"><tr bgcolor="#e6ffff">'.
- '<td align="center"><b> Prob. </b></td>'.
- '<td><b> Title </b></td>'.
- '<td><b> Previous Score </b></td>'.
- '<td><b> New Score </b></td></tr>';
+ my $studentTable=
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th align="center"> '.&mt('Prob.').' </th>'.
+ '<th> '.&mt('Title').' </th>'.
+ '<th> '.&mt('Previous Score').' </th>'.
+ '<th> '.&mt('New Score').' </th>'.
+ &Apache::loncommon::end_data_table_header_row();
$iterator->next(); # skip the first BEGIN_MAP
my $curRes = $iterator->next(); # for "current resource"
@@ -4299,8 +4545,12 @@ sub updateGradeByPage {
my $parts = $curRes->parts();
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
- $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
- (scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';
+ $studentTable.=
+ &Apache::loncommon::start_data_table_row().
+ '<td align="center" valign="top" >'.$prob.
+ (scalar(@{$parts}) == 1 ? ''
+ : '<br />('.&mt('[quant,_1, parts]',scalar(@{$parts}))
+ ).')</td>';
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';
my %newrecord=();
@@ -4387,14 +4637,14 @@ sub updateGradeByPage {
$studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
'<td valign="top">'.$displayPts[1].'</td>'.
- '</tr>';
+ &Apache::loncommon::end_data_table_row();
$prob++;
}
$curRes = $iterator->next();
}
- $studentTable.='</td></tr></table></td></tr></table>';
+ $studentTable.=&Apache::loncommon::end_data_table();
$studentTable.=&show_grading_menu_form($env{'form.symb'});
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
'The scores were changed for '.
@@ -4460,11 +4710,8 @@ the homework problem.
=over 4
-=cut
-=pod
-
=item defaultFormData
Returns html hidden inputs used to hold context/default values.
@@ -4476,12 +4723,12 @@ the homework problem.
sub defaultFormData {
my ($symb)=@_;
- return '
- <input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
+ return '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
}
+
=pod
=item getSequenceDropDown
@@ -4657,8 +4904,8 @@ sub scantron_selectphase {
$result.= <<SCANTRONFORM;
<table width="100%" border="0">
<tr>
- <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
<td bgcolor="#777777">
+ <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
<input type="hidden" name="command" value="scantron_warning" />
$default_form_data
<table width="100%" border="0">
@@ -4696,8 +4943,8 @@ sub scantron_selectphase {
</td>
</tr>
</table>
- </td>
- </form>
+ </form>
+ </td>
</tr>
SCANTRONFORM
@@ -4759,35 +5006,34 @@ SCANTRONFORM
$r->print(<<SCANTRONFORM);
<tr>
- <form action='/adm/grades' name='scantron_download'>
- <td bgcolor="#777777">
+ <td bgcolor="#777777">
+ <form action='/adm/grades' name='scantron_download'>
$default_form_data
<input type="hidden" name="command" value="scantron_download" />
<table width="100%" border="0">
<tr bgcolor="#e6ffff">
- <td colspan="2">
+ <td>
<b>Download a scoring office file</b>
</td>
</tr>
<tr bgcolor="#ffffe6">
- <td> Filename of scoring office file: </td><td> $file_selector </td>
+ <td> Filename of scoring office file: $file_selector </td>
</tr>
<tr bgcolor="#ffffe6">
- <td colspan="2">
+ <td>
<input type="submit" value="Download: Show List of Associated Files" />
</td>
</tr>
</table>
- </td>
- </form>
+ </form>
+ </td>
</tr>
SCANTRONFORM
- $r->print(<<SCANTRONFORM);
- </table>
-$grading_menu_button
-SCANTRONFORM
-
+ $r->print('<tr><td bgcolor="#777777">');
+ &Apache::lonpickcode::code_list($r,2);
+ $r->print('</td></tr></table>');
+ $r->print($grading_menu_button);
return
}
@@ -4952,7 +5198,8 @@ sub username_to_idmap {
sub scantron_fixup_scanline {
my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;
-
+
+
if ($field eq 'ID') {
if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
return ($line,1,'New value too large');
@@ -4983,28 +5230,58 @@ sub scantron_fixup_scanline {
$$scantron_config{'CODElength'})=$args->{'CODE'};
}
} elsif ($field eq 'answer') {
- my $length=$scantron_config->{'Qlength'};
+ &scantron_get_maxbubble(); # Need the bubble counter info.
+ my $length =$scantron_config->{'Qlength'};
my $off=$scantron_config->{'Qoff'};
my $on=$scantron_config->{'Qon'};
- my $answer=${off}x$length;
- if ($args->{'response'} eq 'none') {
- &scan_data($scan_data,
- "$whichline.no_bubble.".$args->{'question'},'1');
- } else {
- if ($on eq 'letter') {
- my @alphabet=('A'..'Z');
- $answer=$alphabet[$args->{'response'}];
- } elsif ($on eq 'number') {
- $answer=$args->{'response'}+1;
- if ($answer == 10) { $answer = '0'; }
+ my $question_number = $args->{'question'} -1;
+ my $first_position = $first_bubble_line{$question_number};
+ my $bubble_count = $bubble_lines_per_response{$question_number};
+ my $bubbles_per_line= $$scantron_config{'Qlength'};
+ my $answer=${off}x($bubbles_per_line*$bubble_count);
+ my $final_answer;
+ if ($$scantron_config{'Qon'} eq 'letter' ||
+ $$scantron_config{'Qon'} eq 'number') {
+ $bubbles_per_line = 10;
+ }
+ if (defined $args->{'response'}) {
+
+ if ($args->{'response'} eq 'none') {
+ &scan_data($scan_data,
+ "$whichline.no_bubble.".$args->{'question'},'1');
} else {
- substr($answer,$args->{'response'},1)=$on;
+ my ($bubble_line, $bubble_number) = split(/:/,$args->{'response'});
+ if ($on eq 'letter') {
+ my @alphabet=('A'..'Z');
+ $answer=$alphabet[$bubble_number];
+ } elsif ($on eq 'number') {
+ $answer= $bubble_number+1;
+ if ($answer == 10) { $answer = '0'; }
+ } else {
+ substr($answer,$bubble_number+$bubble_line*$bubbles_per_line,1)=$on;
+ $final_answer = $answer;
+ }
+ &scan_data($scan_data,
+ "$whichline.no_bubble.".$args->{'question'},undef,'1');
+
+ # Positional notation already has the right final answer length..
+
+ if (($on eq 'letter') || ($on eq 'number')) {
+ for (my $l = 0; $l < $bubble_count; $l++) {
+ if ($l eq $bubble_line) {
+ $final_answer .= $answer;
+ } else {
+ $final_answer .= ' ';
+ }
+ }
+ }
}
- &scan_data($scan_data,
- "$whichline.no_bubble.".$args->{'question'},undef,'1');
+ # $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
+ #substr($line,$where-1,$length)=$answer;
+ substr($line,
+ $scantron_config->{'Qstart'}+$first_position-1,
+ $bubbles_per_line*$length) = $final_answer;
}
- my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
- substr($line,$where-1,$length)=$answer;
}
return $line;
}
@@ -5071,13 +5348,18 @@ sub scan_data {
if just_header was not true these key may also exist
- missingerror - a list of bubbled line numbers that had a blank bubble
- that is considered an error (if the operator had already
- okayed a blank bubble line as really being blank then
- that bubble line number won't appear here.
- doubleerror - a list of bubbled line numbers that had more than one
- bubble filled in and has not been corrected by the
- operator
+ missingerror - a list of bubble ranges that are considered to be answers
+ to a single question that don't have any bubbles filled in.
+ Of the form questionnumber:firstbubblenumber:count.
+ doubleerror - a list of bubble ranges that are considered to be answers
+ to a single question that have more than one bubble filled in.
+ Of the form questionnumber::firstbubblenumber:count
+
+ In the above, count is the number of bubble responses in the
+ input line needed to represent the possible answers to the question.
+ e.g. a radioresponse with 15 choices in an answer sheet with 10 choices
+ per line would have count = 2.
+
maxquest - the number of the last bubble line that was parsed
(<number> starts at 1)
@@ -5092,6 +5374,7 @@ sub scan_data {
sub scantron_parse_scanline {
my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_;
+
my %record;
my $questions=substr($line,$$scantron_config{'Qstart'}-1); # Answers
my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # earlier stuff
@@ -5128,68 +5411,169 @@ sub scantron_parse_scanline {
my @alphabet=('A'..'Z');
my $questnum=0;
- while ($questions) {
+ my $ansnum =1; # Multiple 'answer lines'/question.
+
+ chomp($questions); # Get rid of any trailing \n.
+ $questions =~ s/\r$//; # Get rid of trailing \r too (MAC or Win uploads).
+ while (length($questions)) {
+ my $answers_needed = $bubble_lines_per_response{$questnum};
+ my $answer_length = $$scantron_config{'Qlength'} * $answers_needed;
+
+
+
$questnum++;
- my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});
- substr($questions,0,$$scantron_config{'Qlength'})='';
- if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
+ my $currentquest = substr($questions,0,$answer_length);
+ $questions = substr($questions,0,$answer_length)='';
+ if (length($currentquest) < $answer_length) { next; }
+
+ # Qon letter implies for each slot in currentquest we have:
+ # ? or * for doubles a letter in A-Z for a bubble and
+ # about anything else (esp. a value of Qoff for missing
+ # bubbles.
+
+
if ($$scantron_config{'Qon'} eq 'letter') {
- if ($currentquest eq '?'
- || $currentquest eq '*') {
+
+ if ($currentquest =~ /\?/
+ || $currentquest =~ /\*/
+ || (&occurence_count($currentquest, "[A-Z]") > 1)) {
push(@{$record{'scantron.doubleerror'}},$questnum);
- $record{"scantron.$questnum.answer"}='';
+ for (my $ans = 0; $ans < $answers_needed; $ans++) {
+ my $bubble = substr($currentquest, $ans, 1);
+ if ($bubble =~ /[A-Z]/ ) {
+ $record{"scantron.$ansnum.answer"} = $bubble;
+ } else {
+ $record{"scantron.$ansnum.answer"}='';
+ }
+ $ansnum++;
+ }
+
} elsif (!defined($currentquest)
- || $currentquest eq $$scantron_config{'Qoff'}
- || $currentquest !~ /^[A-Z]$/) {
- $record{"scantron.$questnum.answer"}='';
+ || (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest))
+ || (&occurence_count($currentquest, "[A-Z]") == 0)) {
+ for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
+ $record{"scantron.$ansnum.answer"}='';
+ $ansnum++;
+
+ }
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);
+ # $ansnum += $answers_needed;
}
} else {
- $record{"scantron.$questnum.answer"}=$currentquest;
+ for (my $ans = 0; $ans < $answers_needed; $ans++) {
+ $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
+ $ansnum++;
+ }
}
+
+ # Qon 'number' implies each slot gives a digit that indexes the
+ # the bubbles filled or Qoff or a non number for unbubbled lines.
+ # and *? for double bubbles on a line.
+ # these answers are also stored as letters.
+
} elsif ($$scantron_config{'Qon'} eq 'number') {
- if ($currentquest eq '?'
- || $currentquest eq '*') {
+ if ($currentquest =~ /\?/
+ || $currentquest =~ /\*/
+ || (&occurence_count($currentquest, '\d') > 1)) {
push(@{$record{'scantron.doubleerror'}},$questnum);
- $record{"scantron.$questnum.answer"}='';
+ for (my $ans = 0; $ans < $answers_needed; $ans++) {
+ my $bubble = substr($currentquest, $ans, 1);
+ if ($bubble =~ /\d/) {
+ $record{"scantron.$ansnum.answer"} = $alphabet[$bubble];
+ } else {
+ $record{"scantron.$ansnum.answer"}=' ';
+ }
+ $ansnum++;
+ }
+
} elsif (!defined($currentquest)
- || $currentquest eq $$scantron_config{'Qoff'}
- || $currentquest !~ /^\d$/) {
- $record{"scantron.$questnum.answer"}='';
+ || (&occurence_count($currentquest,$$scantron_config{'Qoff'}) == length($currentquest))
+ || (&occurence_count($currentquest, '\d') == 0)) {
+ for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
+ $record{"scantron.$ansnum.answer"}='';
+ $ansnum++;
+
+ }
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);
+ $ansnum += $answers_needed;
}
+
} else {
- # wrap zero back to J
- if ($currentquest eq '0') {
- $record{"scantron.$questnum.answer"}=
- $alphabet[9];
- } else {
- $record{"scantron.$questnum.answer"}=
- $alphabet[$currentquest-1];
+ $currentquest = &digits_to_letters($currentquest);
+ for (my $ans =0; $ans < $answers_needed; $ans++) {
+ $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
+ $ansnum++;
}
}
} else {
+
+ # Otherwise there's a positional notation;
+ # each bubble line requires Qlength items, and there are filled in
+ # bubbles for each case where there 'Qon' characters.
+ #
+
my @array=split($$scantron_config{'Qon'},$currentquest,-1);
- if (length($array[0]) eq $$scantron_config{'Qlength'}) {
- $record{"scantron.$questnum.answer"}='';
+
+ # If the split only giveas us one element.. the full length of the
+ # answser string, no bubbles are filled in:
+
+ if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
+ for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
+ $record{"scantron.$ansnum.answer"}='';
+ $ansnum++;
+
+ }
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);
}
- } else {
- $record{"scantron.$questnum.answer"}=
- $alphabet[length($array[0])];
+
+ # If the bubble is not the last position, there will be
+ # 2 elements. If it is the last position, there will be 1 element.
+
+ } elsif (scalar(@array) le 2) {
+
+ my $location = length($array[0]);
+ my $line_num = int($location / $$scantron_config{'Qlength'});
+ my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}];
+
+
+ for (my $ans = 0; $ans < $answers_needed; $ans++) {
+ if ($ans eq $line_num) {
+ $record{"scantron.$ansnum.answer"} = $bubble;
+ } else {
+ $record{"scantron.$ansnum.answer"} = ' ';
+ }
+ $ansnum++;
+ }
}
- if (scalar(@array) gt 2) {
+ # If there's more than one instance of a bubble character
+ # That's a double bubble; with positional notation we can
+ # record all the bubbles filled in as well as the
+ # fact this response consists of multiple bubbles.
+ #
+ else {
push(@{$record{'scantron.doubleerror'}},$questnum);
+
+ my $first_answer = $ansnum;
+ for (my $ans =0; $ans < $answers_needed; $ans++) {
+ my $item = $first_answer+$ans;
+ $record{"scantron.$item.answer"} = '';
+ }
+
my @ans=@array;
- my $i=length($ans[0]);shift(@ans);
+ my $i=0;
+ my $increment = 0;
while ($#ans) {
- $i+=length($ans[0])+1;
- $record{"scantron.$questnum.answer"}.=$alphabet[$i];
+ $i+=length($ans[0]) + $increment;
+ my $line = int($i/$$scantron_config{'Qlength'} + $first_answer);
+ my $bubble = $i%$$scantron_config{'Qlength'};
+ $record{"scantron.$line.answer"}.=$alphabet[$bubble];
shift(@ans);
+ $increment = 1;
}
+ $ansnum += $answers_needed;
}
}
}
@@ -5546,6 +5930,16 @@ sub scantron_form_start {
<input type="hidden" name="scantron_options_ignore" value="$env{'form.scantron_options_ignore'}" />
<input type="hidden" name="scantron_options_hidden" value="$env{'form.scantron_options_hidden'}" />
SCANTRONFORM
+
+ my $line = 0;
+ while (defined($env{"form.scantron.bubblelines.$line"})) {
+ my $chunk =
+ '<input type="hidden" name="scantron.bubblelines.'.$line.'" value="'.$env{"form.scantron.bubblelines.$line"}.'" />'."\n";
+ $chunk .=
+ '<input type="hidden" name="scantron.first_bubble_line.'.$line.'" value="'.$env{"form.scantron.first_bubble_line.$line"}.'" />'."\n";
+ $result .= $chunk;
+ $line++;
+ }
return $result;
}
@@ -5604,6 +5998,7 @@ sub scantron_validate_file {
}
my $currentphase=$env{'form.validatepass'};
+
my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {
$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
@@ -6027,6 +6422,8 @@ sub scantron_validate_ID {
#get scantron line setup
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();
+
+ &scantron_get_maxbubble(); # parse needs the bubble_lines.. array.
my %found=('ids'=>{},'usernames'=>{});
for (my $i=0;$i<=$scanlines->{'count'};$i++) {
@@ -6112,7 +6509,7 @@ sub scantron_validate_ID {
sub scantron_get_correction {
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
-#FIXME in the case of a duplicated ID the previous line, probaly 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
#the previous one or the current one
@@ -6211,9 +6608,10 @@ ENDSCRIPT
$r->print($message);
$r->print("<p>Please indicate which bubble should be used for grading</p>");
foreach my $question (@{$arg}) {
- my $selected=$$scan_record{"scantron.$question.answer"};
+ my $selected = &get_response_bubbles($scan_record, $question);
+ my @select_array = split(/:/,$selected);
&scantron_bubble_selector($r,$scan_config,$question,
- split('',$selected));
+ @select_array);
}
} elsif ($error eq 'missingbubble') {
$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
@@ -6223,8 +6621,9 @@ ENDSCRIPT
$r->print('<input type="hidden" name="scantron_questions" value="'.
join(',',@{$arg}).'" />');
foreach my $question (@{$arg}) {
- my $selected=$$scan_record{"scantron.$question.answer"};
- &scantron_bubble_selector($r,$scan_config,$question);
+ my $selected = &get_response_bubbles($scan_record, $question);
+ my @select_array = split(/:/,$selected); # ought to be an array of empties.
+ &scantron_bubble_selector($r,$scan_config,$question, @select_array);
}
} else {
$r->print("\n<ul>");
@@ -6244,35 +6643,35 @@ ENDSCRIPT
$r - Apache request object
$scan_config - hash from &get_scantron_config()
$quest - number of the bubble line to make a corrector for
- $selected - array of letters of previously selected bubbles
- $lines - if present, number of bubble lines to show
+ @lines - array of answer lines.
=cut
sub scantron_bubble_selector {
- my ($r,$scan_config,$quest,@selected, $lines)=@_;
+ my ($r,$scan_config,$quest,@lines)=@_;
my $max=$$scan_config{'Qlength'};
+
my $scmode=$$scan_config{'Qon'};
+
+ my $bubble_length = scalar(@lines);
+
+
if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }
+ my $response = $quest-1;
+ my $lines = $bubble_lines_per_response{$response};
- if (!defined($lines)) {
- $lines = 1;
- }
my $total_lines = $lines*2;
my @alphabet=('A'..'Z');
+
$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");
for (my $l = 0; $l < $lines; $l++) {
if ($l != 0) {
$r->print('<tr>');
}
-
- # FIXME: This loop probably has to be considerably more clever for
- # multiline bubbles: User can multibubble by having bubbles in
- # several lines. User can skip lines legitimately etc. etc.
-
+ my @selected = split(//,$lines[$l]);
for (my $i=0;$i<$max;$i++) {
$r->print("\n".'<td align="center">');
if ($selected[0] eq $alphabet[$i]) {
@@ -6299,9 +6698,10 @@ sub scantron_bubble_selector {
# multiline questions (different values e.g..).
for (my $i=0;$i<$max;$i++) {
+ my $value = "$l:$i"; # Relative bubble line #: Bubble in line.
$r->print("\n".
'<td><label><input type="radio" name="scantron_correct_Q_'.
- $quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
+ $quest.'" value="'.$value.'" />'.$alphabet[$i]."</label></td>");
}
$r->print('</tr>');
@@ -6433,6 +6833,8 @@ sub scantron_validate_CODE {
my %allcodes=&get_codes();
+ &scantron_get_maxbubble(); # parse needs the lines per response array.
+
my ($scanlines,$scan_data)=&scantron_getfile();
for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);
@@ -6485,6 +6887,9 @@ sub scantron_validate_doublebubble {
#get scantron line setup
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();
+
+ &scantron_get_maxbubble(); # parse needs the bubble line array.
+
for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }
@@ -6508,21 +6913,25 @@ sub scantron_validate_doublebubble {
resource and then checking &Apache::lonxml::get_problem_counter()
for what the current value of the problem counter is.
- Caches the result to $env{'form.scantron_maxbubble'}
+ Caches the results to $env{'form.scantron_maxbubble'},
+ $env{'form.scantron.bubble_lines.n'} and
+ $env{'form.scantron.first_bubble_line.n'}
+ which are the total number of bubble, lines, the number of bubble
+ lines for reponse n and number of the first bubble line for response n.
=cut
sub scantron_get_maxbubble {
-
if (defined($env{'form.scantron_maxbubble'}) &&
$env{'form.scantron_maxbubble'}) {
+ &restore_bubble_lines();
return $env{'form.scantron_maxbubble'};
}
- my $navmap=Apache::lonnavmaps::navmap->new();
- my (undef,undef,$sequence)=
+ my (undef, undef, $sequence) =
&Apache::lonnet::decode_symb($env{'form.selectpage'});
+ my $navmap=Apache::lonnavmaps::navmap->new();
my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
@@ -6533,9 +6942,14 @@ sub scantron_get_maxbubble {
my $cid = $env{'request.course.id'};
my $total_lines = 0;
%bubble_lines_per_response = ();
+ %first_bubble_line = ();
+
+ my $response_number = 0;
+ my $bubble_line = 0;
foreach my $resource (@resources) {
my $symb = $resource->symb();
+ &Apache::lonxml::clear_bubble_lines_for_part();
my $result=&Apache::lonnet::ssi($resource->src(),
('symb' => $resource->symb()),
('grade_target' => 'analyze'),
@@ -6550,16 +6964,25 @@ sub scantron_get_maxbubble {
foreach my $part_id (@{$analysis{'parts'}}) {
- my $bubble_lines = $analysis{"$part_id.bubble_lines"}[0];
- if (!$bubble_lines) {
- $bubble_lines = 1;
- }
- $bubble_lines_per_response{"$symb.$part_id"} = $bubble_lines;
- $total_lines = $total_lines + $bubble_lines;
+
+
+ my $lines = $analysis{"$part_id.bubble_lines"};;
+
+ # TODO - make this a persistent hash not an array.
+
+
+ $first_bubble_line{$response_number} = $bubble_line;
+ $bubble_lines_per_response{$response_number} = $lines;
+ $response_number++;
+
+ $bubble_line += $lines;
+ $total_lines += $lines;
}
}
&Apache::lonnet::delenv('scantron\.');
+
+ &save_bubble_lines();
$env{'form.scantron_maxbubble'} =
$total_lines;
return $env{'form.scantron_maxbubble'};
@@ -6570,7 +6993,8 @@ sub scantron_get_maxbubble {
=item scantron_validate_missingbubbles
Validates all scanlines in the selected file to not have any
- bubble lines with missing bubbles that haven't been verified as missing.
+ answers that don't have bubbles that have not been verified
+ to be bubble free.
=cut
@@ -6592,6 +7016,9 @@ sub scantron_validate_missingbubbles {
$scan_data);
if (!defined($$scan_record{'scantron.missingerror'})) { next; }
my @to_correct;
+
+ # Probably here's where the error is...
+
foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
if ($missing > $max_bubble) { next; }
push(@to_correct,$missing);
@@ -6664,6 +7091,9 @@ SCANTRONFORM
my $start=&Time::HiRes::time();
my $i=-1;
my ($uname,$udom,$started);
+
+ &scantron_get_maxbubble(); # Need the bubble lines array to parse.
+
while ($i<$scanlines->{'count'}) {
($uname,$udom)=('','');
$i++;
@@ -6714,8 +7144,6 @@ SCANTRONFORM
}
my $result=&Apache::lonnet::ssi($resource->src(),%form);
if ($result ne '') {
- &Apache::lonnet::logthis("scantron grading error -> $result");
- &Apache::lonnet::logthis("scantron grading error info name $uname domain $udom course $env{'request.course.id'} url ".$resource->src());
}
if (&Apache::loncommon::connection_aborted($r)) { last; }
}
@@ -6923,7 +7351,7 @@ sub show_grading_menu_form {
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="command" value="gradingmenu" />'."\n".
- '<input type="submit" name="submit" value="Grading Menu" />'."\n".
+ '<input type="submit" name="submit" value="'.&mt('Grading Menu').'" />'."\n".
'</form>'."\n";
return $result;
}
@@ -6940,8 +7368,128 @@ sub savedState {
return \%savedState;
}
-#--- Displays the main menu page -------
-sub gradingmenu {
+sub grading_menu {
+ my ($request) = @_;
+ my ($symb)=&get_symb($request);
+ if (!$symb) {return '';}
+ my $probTitle = &Apache::lonnet::gettitle($symb);
+ my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
+
+ $request->print($table);
+ my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
+ 'handgrade'=>$hdgrade,
+ 'probTitle'=>$probTitle,
+ 'command'=>'submit_options',
+ 'saveState'=>"",
+ 'gradingMenu'=>1,
+ 'showgrading'=>"yes");
+ my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+ my @menu = ({ url => $url,
+ name => &mt('Manual Grading/View Submissions'),
+ short_description =>
+ &mt('Start the process of hand grading submissions.'),
+ });
+ $fields{'command'} = 'csvform';
+ $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+ push (@menu, { url => $url,
+ name => &mt('Upload Scores'),
+ short_description =>
+ &mt('Specify a file containing the class scores for current resource.')});
+ $fields{'command'} = 'processclicker';
+ $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+ push (@menu, { url => $url,
+ name => &mt('Process Clicker'),
+ short_description =>
+ &mt('Specify a file containing the clicker information for this resource.')});
+ $fields{'command'} = 'scantron_selectphase';
+ $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+ push (@menu, { url => $url,
+ name => &mt('Grade/Manage Scantron Forms'),
+ short_description =>
+ &mt('')});
+ $fields{'command'} = 'verify';
+ $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+ push (@menu, { url => "",
+ name => &mt('Verify Receipt'),
+ short_description =>
+ &mt('')});
+ #
+ # Create the menu
+ my $Str;
+ # $Str .= '<h2>'.&mt('Please select a grading task').'</h2>';
+ $Str .= '<form method="post" action="" name="gradingMenu">';
+ $Str .= '<input type="hidden" name="command" value="" />'.
+ '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
+ '<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
+ '<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".
+ '<input type="hidden" name="saveState" value="" />'."\n".
+ '<input type="hidden" name="gradingMenu" value="1" />'."\n".
+ '<input type="hidden" name="showgrading" value="yes" />'."\n";
+
+ foreach my $menudata (@menu) {
+ if ($menudata->{'name'} ne &mt('Verify Receipt')) {
+ $Str .=' <h3><a '.
+ $menudata->{'jscript'}.
+ ' href="'.
+ $menudata->{'url'}.'" >'.
+ $menudata->{'name'}."</a></h3>\n";
+ } else {
+ $Str .=' <h3><input type="button" value="'.&mt('Verify Receipt').'" '.
+ $menudata->{'jscript'}.
+ ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
+ ' /></h3>';
+ $Str .= (' 'x8).
+ &mt(' receipt: [_1]',
+ &Apache::lonnet::recprefix($env{'request.course.id'}).
+ '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />');
+ }
+ $Str .= ' '.(' 'x8).$menudata->{'short_description'}.
+ "\n";
+ }
+ $Str .="</form>\n";
+ $request->print(<<GRADINGMENUJS);
+<script type="text/javascript" language="javascript">
+ function checkChoice(formname,val,cmdx) {
+ if (val <= 2) {
+ var cmd = radioSelection(formname.radioChoice);
+ var cmdsave = cmd;
+ } else {
+ cmd = cmdx;
+ cmdsave = 'submission';
+ }
+ formname.command.value = cmd;
+ if (val < 5) formname.submit();
+ if (val == 5) {
+ if (!checkReceiptNo(formname,'notOK')) {
+ return false;
+ } else {
+ formname.submit();
+ }
+ }
+ }
+
+ function checkReceiptNo(formname,nospace) {
+ var receiptNo = formname.receipt.value;
+ var checkOpt = false;
+ if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
+ if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
+ if (checkOpt) {
+ alert("Please enter a receipt number given by a student in the receipt box.");
+ formname.receipt.value = "";
+ formname.receipt.focus();
+ return false;
+ }
+ return true;
+ }
+</script>
+GRADINGMENUJS
+ &commonJSfunctions($request);
+ return $Str;
+}
+
+
+#--- Displays the submissions first page -------
+sub submit_options {
my ($request) = @_;
my ($symb)=&get_symb($request);
if (!$symb) {return '';}
@@ -6984,9 +7532,8 @@ sub gradingmenu {
</script>
GRADINGMENUJS
&commonJSfunctions($request);
- my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>';
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
- $result.=$table;
+ my $result;
my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();
my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
@@ -7003,88 +7550,104 @@ GRADINGMENUJS
'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";
- $result.='<table width="100%" border="0"><tr><td bgcolor=#777777>'."\n".
- '<table width="100%" border="0"><tr bgcolor="#e6ffff"><td colspan="2">'."\n".
- ' <b>Select a Grading/Viewing Option</b></td></tr>'."\n".
- '<tr bgcolor="#ffffe6" valign="top"><td>'."\n";
-
- $result.='<table width="100%" border="0">';
- $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
- ' '.&mt('Select Section').': <select name="section" multiple="multiple" size="3">'."\n";
+ $result.='
+ <div class="LC_grade_select_mode">
+ <div class="LC_grade_select_mode_current">
+ <h2>
+ '.&mt('Grade Current Resource').'
+ </h2>
+ <div class="LC_grade_select_mode_body">
+ <div class="LC_grades_resource_info">
+ '.$table.'
+ </div>
+ <div class="LC_grade_select_mode_selector">
+ <div class="LC_grade_select_mode_selector_header">
+ '.&mt('Sections').'
+ </div>
+ <div class="LC_grade_select_mode_selector_body">
+ <select name="section" multiple="multiple" size="5">'."\n";
if (ref($sections)) {
- foreach (sort (@$sections)) {
- $result.='<option value="'.$_.'" '.
- ($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";
+ foreach my $section (sort (@$sections)) {
+ $result.='<option value="'.$section.'" '.
+ ($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
}
}
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> ';
-
- $result.=&mt('Student Status').':'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
-
- $result.='</td></tr>';
-
- $result.='<tr bgcolor="#ffffe6"valign="top"><td><label>'.
- '<input type="radio" name="radioChoice" value="submission" '.
- ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
- '</label> <select name="submitonly">'.
- '<option value="yes" '.
- ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>'.
- '<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>'.
- '<option value="incorrect" '.
- ($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>'.
- '<option value="all" '.
- ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>'."\n";
-
- $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
- '<label><input type="radio" name="radioChoice" value="viewgrades" '.
- ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
- '<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n";
-
- $result.='<tr bgcolor="#ffffe6" valign="top"><td>'.
- '<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
- ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
- 'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n";
-
- $result.='<tr bgcolor="#ffffe6"><td><br />'.
- '<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
- '</td></tr></table>'."\n";
-
- $result.='</td><td valign="top">';
-
- $result.='<table width="100%" border="0">';
- $result.='<tr bgcolor="#ffffe6"><td>'.
- '<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
- ' '.&mt('scores from file').' </td></tr>'."\n";
-
- $result.='<tr bgcolor="#ffffe6"><td>'.
- '<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'.
- ' '.&mt('clicker file').' </td></tr>'."\n";
-
- $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- '<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
- '" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
-
- if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
- $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
- '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
- ' '.&mt('receipt').': '.
- &Apache::lonnet::recprefix($env{'request.course.id'}).
- '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.
- '</td></tr>'."\n";
- }
- $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- '<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
- '" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
- $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- '<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.
- '" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";
-
- $result.='</table>'."\n".
- '</td></tr></table>'."\n".
- '</td></tr></table></form>'."\n";
+ $result.='
+ </div>
+ </div>
+ <div class="LC_grade_select_mode_selector">
+ <div class="LC_grade_select_mode_selector_header">
+ '.&mt('Groups').'
+ </div>
+ <div class="LC_grade_select_mode_selector_body">
+ '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
+ </div>
+ </div>
+ <div class="LC_grade_select_mode_selector">
+ <div class="LC_grade_select_mode_selector_header">
+ '.&mt('Access Status').'
+ </div>
+ <div class="LC_grade_select_mode_selector_body">
+ '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
+ </div>
+ </div>
+ <div class="LC_grade_select_mode_selector">
+ <div class="LC_grade_select_mode_selector_header">
+ '.&mt('Submission Status').'
+ </div>
+ <div class="LC_grade_select_mode_selector_body">
+ <select name="submitonly" size="5">
+ <option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
+ <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>
+ <option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
+ <option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>
+ </select>
+ </div>
+ </div>
+ <div class="LC_grade_select_mode_type_body">
+ <div class="LC_grade_select_mode_type">
+ <label>
+ <input type="radio" name="radioChoice" value="submission" '.
+ ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
+ &mt('Select individual students to grade and view submissions.').'
+ </label>
+ </div>
+ <div class="LC_grade_select_mode_type">
+ <label>
+ <input type="radio" name="radioChoice" value="viewgrades" '.
+ ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
+ &mt('Grade all selected students in a grading table.').'
+ </label>
+ </div>
+ <div class="LC_grade_select_mode_type">
+ <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="LC_grade_select_mode_page">
+ <h2>
+ '.&mt('Grade Complete Folder for One Student').'
+ </h2>
+ <div class="LC_grades_select_mode_body">
+ <div class="LC_grade_select_mode_type_body">
+ <div class="LC_grade_select_mode_type">
+ <label>
+ <input type="radio" name="radioChoice" value="pickStudentPage" '.
+ ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
+ &mt('The <b>complete</b> page/sequence/folder: For one student').'
+ </label>
+ </div>
+ <div class="LC_grade_select_mode_type">
+ <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>';
return $result;
}
@@ -7118,9 +7681,10 @@ sub gather_clicker_ids {
# Set up a couple variables.
my $username_idx = &Apache::loncoursedata::CL_SNAME();
my $domain_idx = &Apache::loncoursedata::CL_SDOM();
+ my $status_idx = &Apache::loncoursedata::CL_STATUS();
foreach my $student (keys(%$classlist)) {
-
+ if ($classlist->{$student}->[$status_idx] ne 'Active') { next; }
my $username = $classlist->{$student}->[$username_idx];
my $domain = $classlist->{$student}->[$domain_idx];
my $clickers =
@@ -7257,9 +7821,9 @@ function sanitycheck() {
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="file" name="upfile" size="50" />
<br /><label>$type: $selectform</label>
-<br /><label>$attendance: <input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" /></label>
-<br /><label>$personnel: <input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" /></label>
-<br /><label>$specific: <input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" /></label>
+<br /><label><input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" />$attendance </label>
+<br /><label><input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" />$personnel</label>
+<br /><label><input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" />$specific </label>
<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onChange="sanitycheck()" /></label>
@@ -7362,6 +7926,8 @@ ENDHEADER
}
$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
'<input type="hidden" name="number" value="'.$number.'" />'.
+ &mt('Awarding [_1] percent for corrion(s)',$number).'<br />'.
+ '<input type="hidden" name="number" value="'.$number.'" />'.
&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',
$env{'form.pcorrect'},$env{'form.pincorrect'}).
'<br />';
@@ -7592,7 +8158,6 @@ ENDHEADER
sub handler {
my $request=$_[0];
-
&reset_caches();
if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($request,'text/xml');
@@ -7605,9 +8170,12 @@ sub handler {
my $symb=&get_symb($request,1);
my @commands=&Apache::loncommon::get_env_multiple('form.command');
my $command=$commands[0];
+
if ($#commands > 0) {
&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
}
+
+
$request->print(&Apache::loncommon::start_page('Grading'));
if ($symb eq '' && $command eq '') {
if ($env{'user.adv'}) {
@@ -7648,7 +8216,9 @@ sub handler {
} elsif ($command eq 'processGroup' && $perm{'vgr'}) {
&processGroup($request);
} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
- $request->print(&gradingmenu($request));
+ $request->print(&grading_menu($request));
+ } elsif ($command eq 'submit_options' && $perm{'vgr'}) {
+ $request->print(&submit_options($request));
} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
$request->print(&viewgrades($request));
} elsif ($command eq 'handgrade' && $perm{'mgr'}) {