--- loncom/homework/grades.pm 2007/11/01 00:47:42 1.474
+++ loncom/homework/grades.pm 2007/11/16 08:50:39 1.493
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.474 2007/11/01 00:47:42 albertel Exp $
+# $Id: grades.pm,v 1.493 2007/11/16 08:50:39 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -171,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>';
@@ -254,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";
@@ -733,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');
@@ -745,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})) {
@@ -755,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>'.
@@ -763,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);
}
@@ -806,11 +819,18 @@ sub listStudents {
$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) {
@@ -822,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();
@@ -850,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 $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".
@@ -886,35 +925,36 @@ LISTJAVASCRIPT
if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
$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>';
+ $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.='<th>No.</th><th>Select</th>'.
- '<th>'.&nameUserString('header').' '.'Section/Group</th>';
+ $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.='<th>Part: '.$display_part.
- ' Status</h>';
+ 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.='<th>'.&mt('Queue Status').' </th>';
@@ -990,8 +1030,8 @@ LISTJAVASCRIPT
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);
@@ -1017,19 +1057,20 @@ LISTJAVASCRIPT
$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="checked"/;
@@ -1079,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;
}
@@ -1616,8 +1657,7 @@ 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) ? &mt('(problem weight)')
: '<span class="LC_info">'.&mt('problem weight assigned by computer').'</span>';
@@ -1632,41 +1672,47 @@ sub gradeBox {
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="'.
@@ -1675,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;
}
@@ -1707,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++;
}
}
@@ -1853,8 +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");
+ $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.
@@ -1973,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);
@@ -2219,7 +2264,7 @@ KEYWORDS
# 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">'.
@@ -2228,15 +2273,15 @@ 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);
}
@@ -2575,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);
}
@@ -3148,7 +3193,7 @@ 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);
@@ -3166,13 +3211,15 @@ sub viewgrades {
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.=
+ '<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
@@ -3190,48 +3237,52 @@ sub viewgrades {
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
$weight{$partid} = $wgt eq '' ? '1' : $wgt;
- $result.=&Apache::loncommon::start_data_table_row().'<td>';
- $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.=
- '<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><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>'.&Apache::loncommon::end_data_table_row()."\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.=&Apache::loncommon::end_data_table()."\n".
'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
- $result.='<input type="button" value="Revert to Default" '.
+ $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.= '<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>No.</th>'.
+ '<th>'.&mt('No.').'</th>'.
'<th>'.&nameUserString('header')."</th>\n";
my (@parts) = sort(&getpartlist($symb));
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
@@ -3244,13 +3295,20 @@ sub viewgrades {
push(@partids, $partid);
my $display_part=&get_display_part($partid,$symb);
if ($display =~ /^Partial Credit Factor/) {
- $result.='<th>Score Part: '.$display_part.
- ' <br />(weight = '.$weight{$partid}.')</th>'."\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.='<th>'.$display.'</th>'."\n";
}
$result.=&Apache::loncommon::end_data_table_header_row();
@@ -3275,14 +3333,14 @@ sub viewgrades {
}
$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',
+ &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
$section_display, $stu_status).
'</span>';
}
@@ -3338,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="'.
@@ -3362,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',
@@ -3395,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);
@@ -3405,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;
@@ -3432,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 = ();
@@ -3501,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'};
@@ -3534,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) {
@@ -3545,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 .= &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 .= '</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::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;
}
@@ -4031,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+)\.(.*)/);
@@ -4058,13 +4135,16 @@ 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();
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -4073,21 +4153,23 @@ LISTJAVASCRIPT
'<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;
@@ -4099,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);
@@ -4161,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'});
}
@@ -4180,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;
}
@@ -4202,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);
@@ -4224,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' ) {
@@ -4240,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}) {
@@ -4283,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);
@@ -4364,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 />';
@@ -4432,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"
@@ -4450,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=();
@@ -4538,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 '.
@@ -4802,52 +4901,48 @@ sub scantron_selectphase {
# Chunk of form to prompt for a file to grade and how:
- $result.= <<SCANTRONFORM;
- <table width="100%" border="0">
- <tr>
- <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
- <td bgcolor="#777777">
- <input type="hidden" name="command" value="scantron_warning" />
- $default_form_data
- <table width="100%" border="0">
- <tr bgcolor="#e6ffff">
- <td colspan="2">
- <b>Specify file and which Folder/Sequence to grade</b>
- </td>
- </tr>
- <tr bgcolor="#ffffe6">
- <td> Sequence to grade: </td><td> $sequence_selector </td>
- </tr>
- <tr bgcolor="#ffffe6">
- <td> Filename of scoring office file: </td><td> $file_selector </td>
- </tr>
- <tr bgcolor="#ffffe6">
- <td> Format of data file: </td><td> $format_selector </td>
- </tr>
- <tr bgcolor="#ffffe6">
- <td> Saved CODEs to validate against: </td><td> $CODE_selector</td>
- </tr>
- <tr bgcolor="#ffffe6">
- <td> Each CODE is only to be used once:</td><td> $CODE_unique </td>
- </tr>
- <tr bgcolor="#ffffe6">
- <td> Options: </td>
+ $result.= '
+ <br />
+ <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
+ <input type="hidden" name="command" value="scantron_warning" />
+ '.$default_form_data.'
+ '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+ '.&Apache::loncommon::start_data_table_header_row().'
+ <th colspan="2">
+ '.&mt('Specify file and which Folder/Sequence to grade').'
+ </th>
+ '.&Apache::loncommon::end_data_table_header_row().'
+ '.&Apache::loncommon::start_data_table_row().'
+ <td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td>
+ '.&Apache::loncommon::end_data_table_row().'
+ '.&Apache::loncommon::start_data_table_row().'
+ <td> '.&mt('Filename of scoring office file:').' </td><td> '.$file_selector.' </td>
+ '.&Apache::loncommon::end_data_table_row().'
+ '.&Apache::loncommon::start_data_table_row().'
+ <td> '.&mt('Format of data file:').' </td><td> '.$format_selector.' </td>
+ '.&Apache::loncommon::end_data_table_row().'
+ '.&Apache::loncommon::start_data_table_row().'
+ <td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td>
+ '.&Apache::loncommon::end_data_table_row().'
+ '.&Apache::loncommon::start_data_table_row().'
+ <td> '.&mt('Each CODE is only to be used once:').'</td><td> '.$CODE_unique.' </td>
+ '.&Apache::loncommon::end_data_table_row().'
+ '.&Apache::loncommon::start_data_table_row().'
+ <td> '.&mt('Options:').' </td>
<td>
- <label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />
- <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all existing corrections</label> <br />
- <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label>
+ <label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> '.&mt('Do only previously skipped records').'</label> <br />
+ <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> '.&mt('Remove all existing corrections').'</label> <br />
+ <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> '.&mt('Skip hidden resources when grading').'</label>
</td>
- </tr>
- <tr bgcolor="#ffffe6">
+ '.&Apache::loncommon::end_data_table_row().'
+ '.&Apache::loncommon::start_data_table_row().'
<td colspan="2">
- <input type="submit" value="Grading: Validate Scantron Records" />
+ <input type="submit" value="'.&mt('Grading: Validate Scantron Records').'" />
</td>
- </tr>
- </table>
- </td>
- </form>
- </tr>
-SCANTRONFORM
+ '.&Apache::loncommon::end_data_table_row().'
+ '.&Apache::loncommon::end_data_table().'
+ </form>
+';
$r->print($result);
@@ -4856,84 +4951,74 @@ SCANTRONFORM
# Chunk of form to prompt for a scantron file upload.
- $r->print(<<SCANTRONFORM);
- <tr>
- <td bgcolor="#777777">
- <table width="100%" border="0">
- <tr bgcolor="#e6ffff">
+ $r->print('
+ <br />
+ '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+ '.&Apache::loncommon::start_data_table_header_row().'
+ <th>
+ '.&mt('Specify a Scantron data file to upload.').'
+ </th>
+ '.&Apache::loncommon::end_data_table_header_row().'
+ '.&Apache::loncommon::start_data_table_row().'
<td>
- <b>Specify a Scantron data file to upload.</b>
- </td>
- </tr>
- <tr bgcolor="#ffffe6">
- <td>
-SCANTRONFORM
+');
my $default_form_data=&defaultFormData(&get_symb($r,1));
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
- $r->print(<<UPLOAD);
+ $r->print('
<script type="text/javascript" language="javascript">
function checkUpload(formname) {
if (formname.upfile.value == "") {
- alert("Please use the browse button to select a file from your local directory.");
+ alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
return false;
}
formname.submit();
}
</script>
- <form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
- $default_form_data
- <input name='courseid' type='hidden' value='$cnum' />
- <input name='domainid' type='hidden' value='$cdom' />
- <input name='command' value='scantronupload_save' type='hidden' />
- File to upload:<input type="file" name="upfile" size="50" />
+ <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
+ '.$default_form_data.'
+ <input name="courseid" type="hidden" value="'.$cnum.'" />
+ <input name="domainid" type="hidden" value="'.$cdom.'" />
+ <input name="command" value="scantronupload_save" type="hidden" />
+ '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
<br />
- <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+ <input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
</form>
-UPLOAD
+');
- $r->print(<<SCANTRONFORM);
+ $r->print('
</td>
- </tr>
- </table>
- </td>
- </tr>
-SCANTRONFORM
+ '.&Apache::loncommon::end_data_table_row().'
+ '.&Apache::loncommon::end_data_table().'
+');
}
# Chunk of the form that prompts to view a scoring office file,
# corrected file, skipped records in a file.
- $r->print(<<SCANTRONFORM);
- <tr>
- <form action='/adm/grades' name='scantron_download'>
- <td bgcolor="#777777">
- $default_form_data
- <input type="hidden" name="command" value="scantron_download" />
- <table width="100%" border="0">
- <tr bgcolor="#e6ffff">
- <td colspan="2">
- <b>Download a scoring office file</b>
- </td>
- </tr>
- <tr bgcolor="#ffffe6">
- <td> Filename of scoring office file: </td><td> $file_selector </td>
- </tr>
- <tr bgcolor="#ffffe6">
- <td colspan="2">
- <input type="submit" value="Download: Show List of Associated Files" />
- </td>
- </tr>
- </table>
- </td>
- </form>
- </tr>
-SCANTRONFORM
+ $r->print('
+ <br />
+ <form action="/adm/grades" name="scantron_download">
+ '.$default_form_data.'
+ <input type="hidden" name="command" value="scantron_download" />
+ '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+ '.&Apache::loncommon::start_data_table_header_row().'
+ <th>
+ '.&mt('Download a scoring office file').'
+ </th>
+ '.&Apache::loncommon::end_data_table_header_row().'
+ '.&Apache::loncommon::start_data_table_row().'
+ <td> '.&mt('Filename of scoring office file: [_1]',$file_selector).'
+ <br />
+ <input type="submit" value="'.&mt('Download: Show List of Associated Files').'" />
+ '.&Apache::loncommon::end_data_table_row().'
+ '.&Apache::loncommon::end_data_table().'
+ </form>
+ <br />
+');
- $r->print('<tr><td bgcolor="#777777">');
&Apache::lonpickcode::code_list($r,2);
- $r->print('</td></tr></table>');
$r->print($grading_menu_button);
return
}
@@ -5099,7 +5184,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');
@@ -5130,28 +5216,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;
}
@@ -5290,10 +5406,9 @@ sub scantron_parse_scanline {
my $answer_length = $$scantron_config{'Qlength'} * $answers_needed;
-
$questnum++;
my $currentquest = substr($questions,0,$answer_length);
- $questions = substr($questions,0,$answer_length)='';
+ $questions = substr($questions,$answer_length);
if (length($currentquest) < $answer_length) { next; }
# Qon letter implies for each slot in currentquest we have:
@@ -5303,7 +5418,6 @@ sub scantron_parse_scanline {
if ($$scantron_config{'Qon'} eq 'letter') {
-
if ($currentquest =~ /\?/
|| $currentquest =~ /\*/
|| (&occurence_count($currentquest, "[A-Z]") > 1)) {
@@ -5332,7 +5446,8 @@ sub scantron_parse_scanline {
}
} else {
for (my $ans = 0; $ans < $answers_needed; $ans++) {
- $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
+ my $bubble = substr($currentquest, $ans, 1);
+ $record{"scantron.$ansnum.answer"} = $bubble;
$ansnum++;
}
}
@@ -5398,11 +5513,15 @@ sub scantron_parse_scanline {
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);
}
- } elsif (scalar(@array) lt 2) {
+
+
+
+ } elsif (scalar(@array) eq 2) {
my $location = length($array[0]);
- my $line_num = $location / $$scantron_config{'Qlength'};
+ 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) {
@@ -5688,7 +5807,7 @@ sub remember_current_skipped {
sub check_for_error {
my ($r,$result)=@_;
if ($result ne 'ok' && $result ne 'not_found' ) {
- $r->print("An error occurred ($result) when trying to Remove the existing corrections.");
+ $r->print(&mt("An error occurred ([_1]) when trying to remove the existing corrections.",$result));
}
}
@@ -5712,25 +5831,25 @@ sub scantron_warning_screen {
$CODElist=$env{'form.scantron_CODElist'};
if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }
$CODElist=
- '<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
+ '<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.
$env{'form.scantron_CODElist'}.'</tt></td></tr>';
}
- return (<<STUFF);
+ return ('
<p>
-<span class="LC_warning">Please double check the information
- below before clicking on '$button_text'</span>
+<span class="LC_warning">
+'.&mt('Please double check the information below before clicking on \'[_1]\'',&mt($button_text)).'</span>
</p>
<table>
-<tr><td><b>Sequence to be Graded:</b></td><td>$title</td></tr>
-<tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr>
-$CODElist
+<tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr>
+<tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr>
+'.$CODElist.'
</table>
<br />
-<p> If this information is correct, please click on '$button_text'.</p>
-<p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>
+<p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p>
+<p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p>
<br />
-STUFF
+');
}
=pod
@@ -5751,23 +5870,23 @@ sub scantron_do_warning {
if ( $env{'form.selectpage'} eq '' ||
$env{'form.scantron_selectfile'} eq '' ||
$env{'form.scantron_format'} eq '' ) {
- $r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>");
+ $r->print("<p>".&mt('You have forgetten to specify some information. Please go Back and try again.')."</p>");
if ( $env{'form.selectpage'} eq '') {
- $r->print('<p><span class="LC_error">You have not selected a Sequence to grade</span></p>');
+ $r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>');
}
if ( $env{'form.scantron_selectfile'} eq '') {
- $r->print('<p><span class="LC_error">You have not selected a file that contains the student\'s response data.</span></p>');
+ $r->print('<p><span class="LC_error">'.&mt('You have not selected a file that contains the student\'s response data.').'</span></p>');
}
if ( $env{'form.scantron_format'} eq '') {
- $r->print('<p><span class="LC_error">You have not selected a the format of the student\'s response data.</span></p>');
+ $r->print('<p><span class="LC_error">'.&mt('You have not selected a the format of the student\'s response data.').'</span></p>');
}
} else {
my $warning=&scantron_warning_screen('Grading: Validate Records');
- $r->print(<<STUFF);
-$warning
-<input type="submit" name="submit" value="Grading: Validate Records" />
+ $r->print('
+'.$warning.'
+<input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />
<input type="hidden" name="command" value="scantron_validate" />
-STUFF
+');
}
$r->print("</form><br />".&show_grading_menu_form($symb));
return '';
@@ -5846,7 +5965,7 @@ sub scantron_validate_file {
if ($env{'form.scantron_corrections'}) {
&scantron_process_corrections($r);
}
- $r->print("<p>Gathering necessary info.</p>");$r->rflush();
+ $r->print('<p>'.&mt('Gathering necessary info.').'</p>');$r->rflush();
#get the student pick code ready
$r->print(&Apache::loncommon::studentbrowser_javascript());
my $max_bubble=&scantron_get_maxbubble();
@@ -5866,7 +5985,7 @@ sub scantron_validate_file {
my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {
- $r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
+ $r->print('<p> '.&mt('Validating '.$validate_phases[$currentphase]).'</p>');
$r->rflush();
my $which="scantron_validate_".$validate_phases[$currentphase];
{
@@ -5876,12 +5995,12 @@ sub scantron_validate_file {
}
if (!$stop) {
my $warning=&scantron_warning_screen('Start Grading');
- $r->print(<<STUFF);
-Validation process complete.<br />
-$warning
-<input type="submit" name="submit" value="Start Grading" />
+ $r->print('
+'.&mt('Validation process complete.').'<br />
+'.$warning.'
+<input type="submit" name="submit" value="'.&mt('Start Grading').'" />
<input type="hidden" name="command" value="scantron_process" />
-STUFF
+');
} else {
$r->print('<input type="hidden" name="command" value="scantron_validate" />');
@@ -5889,15 +6008,15 @@ STUFF
}
if ($stop) {
if ($validate_phases[$currentphase] eq 'sequence') {
- $r->print('<input type="submit" name="submit" value="Ignore -> " />');
- $r->print(' this error <br />');
+ $r->print('<input type="submit" name="submit" value="'.&mt('Ignore ->').' " />');
+ $r->print(' '.&mt('this error').' <br />');
- $r->print(" <p>Or click the 'Grading Menu' button to start over.</p>");
+ $r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");
} else {
- $r->print('<input type="submit" name="submit" value="Continue ->" />');
- $r->print(' using corrected info <br />');
- $r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");
- $r->print(" this scanline saving it for later.");
+ $r->print('<input type="submit" name="submit" value="'.&mt('Continue ->').'" />');
+ $r->print(' '.&mt('using corrected info').' <br />');
+ $r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />");
+ $r->print(" ".&mt("this scanline saving it for later."));
}
}
$r->print(" </form><br />".&show_grading_menu_form($symb));
@@ -5958,7 +6077,10 @@ sub scantron_remove_scan_data {
}
my $result;
if (@todelete) {
- $result=&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);
+ $result = &Apache::lonnet::del('nohist_scantrondata',
+ \@todelete,$cdom,$cname);
+ } else {
+ $result = 'ok';
}
return $result;
}
@@ -6378,30 +6500,32 @@ sub scantron_get_correction {
#to show both the current line and the previous one and allow skipping
#the previous one or the current one
- $r->print("<p><b>An error was detected ($error)</b>");
if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
- $r->print(" for PaperID <tt>".
- $$scan_record{'scantron.PaperID'}."</tt> \n");
+ $r->print("<p>".&mt("<b>An error was detected ($error)</b>".
+ " for PaperID <tt>[_1]</tt>",
+ $$scan_record{'scantron.PaperID'})."</p> \n");
} else {
- $r->print(" in scanline $i <pre>".
- $line."</pre> \n");
- }
- my $message="<p>The ID on the form is <tt>".
- $$scan_record{'scantron.ID'}."</tt><br />\n".
- "The name on the paper is ".
- $$scan_record{'scantron.LastName'}.",".
- $$scan_record{'scantron.FirstName'}."</p>";
+ $r->print("<p>".&mt("<b>An error was detected ($error)</b>".
+ " in scanline [_1] <pre>[_2]</pre>",
+ $i,$line)."</p> \n");
+ }
+ my $message="<p>".&mt("The ID on the form is <tt>[_1]</tt><br />".
+ "The name on the paper is [_2],[_3]",
+ $$scan_record{'scantron.ID'},
+ $$scan_record{'scantron.LastName'},
+ $$scan_record{'scantron.FirstName'})."</p>";
$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
if ($error =~ /ID$/) {
if ($error eq 'incorrectID') {
- $r->print("The encoded ID is not in the classlist</p>\n");
+ $r->print("<p>".&mt("The encoded ID is not in the classlist").
+ "</p>\n");
} elsif ($error eq 'duplicateID') {
- $r->print("The encoded ID has also been used by a previous paper $arg</p>\n");
+ $r->print("<p>".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
}
$r->print($message);
- $r->print("<p>How should I handle this? <br /> \n");
+ $r->print("<p>".&mt("How should I handle this?")." <br /> \n");
$r->print("\n<ul><li> ");
#FIXME it would be nice if this sent back the user ID and
#could do partial userID matches
@@ -6414,14 +6538,14 @@ sub scantron_get_correction {
$r->print('</li>');
} elsif ($error =~ /CODE$/) {
if ($error eq 'incorrectCODE') {
- $r->print("</p><p>The encoded CODE is not in the list of possible CODEs</p>\n");
+ $r->print("<p>".&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n");
} elsif ($error eq 'duplicateCODE') {
- $r->print("</p><p>The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique</p>\n");
+ $r->print("<p>".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");
}
- $r->print("<p>The CODE on the form is <tt>'".
- $$scan_record{'scantron.CODE'}."'</tt><br />\n");
+ $r->print("<p>".&mt("The CODE on the form is <tt>'[_1]'</tt>",
+ $$scan_record{'scantron.CODE'})."<br />\n");
$r->print($message);
- $r->print("<p>How should I handle this? <br /> \n");
+ $r->print("<p>".&mt("How should I handle this?")." <br /> \n");
$r->print("\n<br /> ");
my $i=0;
if ($error eq 'incorrectCODE'
@@ -6431,7 +6555,13 @@ sub scantron_get_correction {
foreach my $testcode (@{$closest}) {
my $checked='';
if (!$i) { $checked=' checked="checked" '; }
- $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
+ $r->print("
+ <label>
+ <input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked />
+ ".&mt("Use the similar CODE [_1] instead.",
+ "<b><tt>".$testcode."</tt></b>")."
+ </label>
+ <input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
$r->print("\n<br />");
$i++;
}
@@ -6439,7 +6569,12 @@ sub scantron_get_correction {
}
if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
my $checked; if (!$i) { $checked=' checked="checked" '; }
- $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>");
+ $r->print("
+ <label>
+ <input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked />
+ ".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.",
+ "<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."
+ </label>");
$r->print("\n<br />");
}
@@ -6461,17 +6596,27 @@ ENDSCRIPT
"&curCODE=".&escape($$scan_record{'scantron.CODE'}).
"&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});
if ($env{'form.scantron_CODElist'} =~ /\S/) {
- $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");
+ $r->print("
+ <label>
+ <input type='radio' name='scantron_CODE_resolution' value='use_found' />
+ ".&mt("[_1]Select[_2] a CODE from the list of all CODEs and use it.",
+ "<a target='_blank' href='$href'>","</a>")."
+ </label>
+ ".&mt("Selected CODE is [_1]","<input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />"));
$r->print("\n<br />");
}
- $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");
+ $r->print("
+ <label>
+ <input type='radio' name='scantron_CODE_resolution' value='use_typed' />
+ ".&mt("Use [_1] as the CODE.",
+ "</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />"));
$r->print("\n<br /><br />");
} elsif ($error eq 'doublebubble') {
- $r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");
+ $r->print("<p>".&mt("There have been multiple bubbles scanned for a some question(s)")."</p>\n");
$r->print('<input type="hidden" name="scantron_questions" value="'.
join(',',@{$arg}).'" />');
$r->print($message);
- $r->print("<p>Please indicate which bubble should be used for grading</p>");
+ $r->print("<p>".&mt("Please indicate which bubble should be used for grading")."</p>");
foreach my $question (@{$arg}) {
my $selected = &get_response_bubbles($scan_record, $question);
my @select_array = split(/:/,$selected);
@@ -6479,10 +6624,10 @@ ENDSCRIPT
@select_array);
}
} elsif ($error eq 'missingbubble') {
- $r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
+ $r->print("<p>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</p>\n");
$r->print($message);
- $r->print("<p>Please indicate which bubble should be used for grading</p>");
- $r->print("Some questions have no scanned bubbles\n");
+ $r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");
+ $r->print(&mt("Some questions have no scanned bubbles")."\n");
$r->print('<input type="hidden" name="scantron_questions" value="'.
join(',',@{$arg}).'" />');
foreach my $question (@{$arg}) {
@@ -6529,6 +6674,7 @@ sub scantron_bubble_selector {
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++) {
@@ -6552,7 +6698,7 @@ sub scantron_bubble_selector {
my $lspan = $total_lines * 2; # 2 table rows per bubble line.
$r->print('<td rowspan='.$lspan.'><label><input type="radio" name="scantron_correct_Q_'.
- $quest.'" value="none" /> No bubble </label></td>');
+ $quest.'" value="none" /> '.&mt('No bubble').' </label></td>');
}
@@ -6562,9 +6708,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>');
@@ -6812,7 +6959,6 @@ sub scantron_get_maxbubble {
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'),
@@ -6828,9 +6974,10 @@ sub scantron_get_maxbubble {
foreach my $part_id (@{$analysis{'parts'}}) {
-
my $lines = $analysis{"$part_id.bubble_lines"};;
+
+
# TODO - make this a persistent hash not an array.
@@ -7042,7 +7189,7 @@ sub scantron_upload_scantron_data {
my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
'domainid');
my $default_form_data=&defaultFormData(&get_symb($r,1));
- $r->print(<<UPLOAD);
+ $r->print('
<script type="text/javascript" language="javascript">
function checkUpload(formname) {
if (formname.upfile.value == "") {
@@ -7053,19 +7200,23 @@ sub scantron_upload_scantron_data {
}
</script>
-<form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
-$default_form_data
+<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
+'.$default_form_data.'
<table>
-<tr><td>$select_link </td></tr>
-<tr><td>Course ID: </td><td><input name='courseid' type='text' /> </td></tr>
-<tr><td>Course Name: </td><td><input name='coursename' type='text' /></td></tr>
-<tr><td>Domain: </td><td>$domsel </td></tr>
-<tr><td>File to upload:</td><td><input type="file" name="upfile" size="50" /></td></tr>
+<tr><td>'.$select_link.' </td></tr>
+<tr><td>'.&mt('Course ID:').' </td>
+ <td><input name="courseid" type="text" /> </td></tr>
+<tr><td>'.&mt('Course Name:').' </td>
+ <td><input name="coursename" type="text" /> </td></tr>
+<tr><td>'.&mt('Domain:').' </td>
+ <td>'.$domsel.' </td></tr>
+<tr><td>'.&mt('File to upload:').'</td>
+ <td><input type="file" name="upfile" size="50" /></td></tr>
</table>
-<input name='command' value='scantronupload_save' type='hidden' />
-<input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+<input name="command" value="scantronupload_save" type="hidden" />
+<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
</form>
-UPLOAD
+');
return '';
}
@@ -7084,12 +7235,12 @@ sub scantron_upload_scantron_data_save {
my $doanotherupload=
'<br /><form action="/adm/grades" method="post">'."\n".
'<input type="hidden" name="command" value="scantronupload" />'."\n".
- '<input type="submit" name="submit" value="Do Another Upload" />'."\n".
+ '<input type="submit" name="submit" value="'.&mt('Do Another Upload').'" />'."\n".
'</form>'."\n";
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
!&Apache::lonnet::allowed('usc',
$env{'form.domainid'}.'_'.$env{'form.courseid'})) {
- $r->print("You are not allowed to upload Scantron data to the requested course.<br />");
+ $r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />");
if ($symb) {
$r->print(&show_grading_menu_form($symb));
} else {
@@ -7098,7 +7249,7 @@ sub scantron_upload_scantron_data_save {
return '';
}
my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
- $r->print("Doing upload to ".$coursedata{'description'}." <br />");
+ $r->print(&mt("Doing upload to [_1]",$coursedata{'description'})." <br />");
my $fname=$env{'form.upfile.filename'};
#FIXME
#copied from lonnet::userfileupload()
@@ -7116,13 +7267,18 @@ sub scantron_upload_scantron_data_save {
my $uploadedfile=$fname;
$fname='scantron_orig_'.$fname;
if (length($env{'form.upfile'}) < 2) {
- $r->print("<span class=\"LC_error\">Error:</span> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
+ $r->print(&mt("<span class=\"LC_error\">Error:</span> The file you attempted to upload, [_1] contained no information. Please check that you entered the correct filename.",'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));
} else {
my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
if ($result =~ m|^/uploaded/|) {
- $r->print("<span class=\"LC_success\">Success:</span> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
+ $r->print(&mt("<span class=\"LC_success\">Success:</span> Successfully uploaded [_1] bytes of data into location [_2]",
+ (length($env{'form.upfile'})-1),
+ '<span class="LC_filename">'.$result."</span>"));
} else {
- $r->print("<span class=\"LC_error\">Error:</span> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");
+ $r->print(&mt("<span class=\"LC_error\">Error:</span> An error ([_1]) occurred when attempting to upload the file, [_2]",
+ $result,
+ '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));
+
}
}
if ($symb) {
@@ -7166,11 +7322,11 @@ sub scantron_download_scantron_data {
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $file=$env{'form.scantron_selectfile'};
if (! &valid_file($file)) {
- $r->print(<<ERROR);
+ $r->print('
<p>
- The requested file name was invalid.
+ '.&mt('The requested file name was invalid.').'
</p>
-ERROR
+');
$r->print(&show_grading_menu_form(&get_symb($r,1)));
return;
}
@@ -7180,17 +7336,20 @@ ERROR
&Apache::lonnet::allowuploaded('/adm/grades',$orig);
&Apache::lonnet::allowuploaded('/adm/grades',$corrected);
&Apache::lonnet::allowuploaded('/adm/grades',$skipped);
- $r->print(<<DOWNLOAD);
+ $r->print('
<p>
- <a href="$orig">Original</a> file as uploaded by the scantron office.
+ '.&mt('[_1]Original[_2] file as uploaded by the scantron office.',
+ '<a href="'.$orig.'">','</a>').'
</p>
<p>
- <a href="$corrected">Corrections</a>, a file of corrected records that were used in grading.
+ '.&mt('[_1]Corrections[_2], a file of corrected records that were used in grading.',
+ '<a href="'.$corrected.'">','</a>').'
</p>
<p>
- <a href="$skipped">Skipped</a>, a file of records that were skipped.
+ '.&mt('[_1]Skipped[_2], a file of records that were skipped.',
+ '<a href="'.$skipped.'">','</a>').'
</p>
-DOWNLOAD
+');
$r->print(&show_grading_menu_form(&get_symb($r,1)));
return '';
}
@@ -7214,7 +7373,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;
}
@@ -7284,7 +7443,7 @@ sub grading_menu {
$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.'" ue="" />'."\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";
@@ -7297,18 +7456,18 @@ sub grading_menu {
$menudata->{'url'}.'" >'.
$menudata->{'name'}."</a></h3>\n";
} else {
- $Str .=' <h3><input type="button" value="Verify Receipt" '.
+ $Str .=' <h3><input type="button" value="'.&mt('Verify Receipt').'" '.
$menudata->{'jscript'}.
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
' /></h3>';
$Str .= (' 'x8).
- ' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).
- '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
+ &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 .="</dl>\n";
$Str .="</form>\n";
$request->print(<<GRADINGMENUJS);
<script type="text/javascript" language="javascript">