version 1.470, 2007/10/29 09:46:28
|
version 1.489, 2007/11/13 01:47:36
|
Line 171 sub get_symb {
|
Line 171 sub get_symb {
|
sub nameUserString { |
sub nameUserString { |
my ($type,$fullname,$uname,$udom) = @_; |
my ($type,$fullname,$uname,$udom) = @_; |
if ($type eq 'header') { |
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 { |
} else { |
return ' '.$fullname.'<span class="LC_internal_info"> ('.$uname. |
return ' '.$fullname.'<span class="LC_internal_info"> ('.$uname. |
($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>'; |
($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>'; |
Line 254 sub showResourceInfo {
|
Line 254 sub showResourceInfo {
|
$partsseen{$partID}=1; |
$partsseen{$partID}=1; |
} |
} |
my $display_part=&get_display_part($partID,$symb); |
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>'. |
$resID.'</span></td>'. |
'<td><b>Type: </b>'.$responsetype.'</td></tr>'; |
'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>'; |
# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>'; |
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>'; |
} |
} |
} |
} |
$result.='</table>'."\n"; |
$result.='</table>'."\n"; |
Line 733 sub verifyreceipt {
|
Line 733 sub verifyreceipt {
|
$receipt =~ s/[^\-\d]//g; |
$receipt =~ s/[^\-\d]//g; |
my ($symb) = &get_symb($request); |
my ($symb) = &get_symb($request); |
|
|
my $title.='<h3><span class="LC_info">Verifying Submission Receipt '. |
my $title.= |
$receipt.'</h3></span>'."\n". |
'<h3><span class="LC_info">'. |
'<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><br /><br />'."\n"; |
&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 ($string,$contents,$matches) = ('','',0); |
my (undef,undef,$fullname) = &getclasslist('all','0'); |
my (undef,undef,$fullname) = &getclasslist('all','0'); |
Line 745 sub verifyreceipt {
|
Line 748 sub verifyreceipt {
|
$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; } |
$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; } |
my $parts=['0']; |
my $parts=['0']; |
if ($receiptparts) { ($parts)=&response_type($symb); } |
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 |
foreach (sort |
{ |
{ |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
if (lc($$fullname{$a}) ne lc($$fullname{$b})) { |
Line 755 sub verifyreceipt {
|
Line 771 sub verifyreceipt {
|
my ($uname,$udom)=split(/\:/); |
my ($uname,$udom)=split(/\:/); |
foreach my $part (@$parts) { |
foreach my $part (@$parts) { |
if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) { |
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. |
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
'\');" target="_self">'.$$fullname{$_}.'</a> </td>'."\n". |
'\');" target="_self">'.$$fullname{$_}.'</a> </td>'."\n". |
'<td> '.$uname.' </td>'. |
'<td> '.$uname.' </td>'. |
Line 763 sub verifyreceipt {
|
Line 781 sub verifyreceipt {
|
if ($receiptparts) { |
if ($receiptparts) { |
$contents.='<td> '.$part.' </td>'; |
$contents.='<td> '.$part.' </td>'; |
} |
} |
$contents.='</tr>'."\n"; |
$contents.= |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
|
$matches++; |
$matches++; |
} |
} |
} |
} |
} |
} |
if ($matches == 0) { |
if ($matches == 0) { |
$string = $title.'No match found for the above receipt.'; |
$string = $title.&mt('No match found for the above receipt.'); |
} else { |
} else { |
$string = &jscriptNform($symb).$title. |
$string = &jscriptNform($symb).$title. |
'The above receipt matches the following student'. |
'<p>'. |
($matches <= 1 ? '.' : 's.')."\n". |
&mt('The above receipt matches the following [numerate,_1,student].',$matches). |
'<table border="0"><tr><td bgcolor="#777777">'."\n". |
'</p>'. |
'<table border="0"><tr bgcolor="#e6ffff">'."\n". |
$header. |
'<td><b> Fullname </b></td>'."\n". |
$contents. |
'<td><b> Username </b></td>'."\n". |
&Apache::loncommon::end_data_table()."\n"; |
'<td><b> Domain </b></td>'; |
|
if ($receiptparts) { |
|
$string.='<td> Problem Part </td>'; |
|
} |
|
$string.='</tr>'."\n".$contents. |
|
'</table></td></tr></table>'."\n"; |
|
} |
} |
return $string.&show_grading_menu_form($symb); |
return $string.&show_grading_menu_form($symb); |
} |
} |
Line 806 sub listStudents {
|
Line 819 sub listStudents {
|
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
|
|
my $result='<h3><span class="LC_info"> '.$viewgrade. |
my $result='<h3><span class="LC_info"> '. |
' Submissions for a Student or a Group of Students</span></h3>'; |
&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 ($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); |
$request->print(<<LISTJAVASCRIPT); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function checkSelect(checkBox) { |
function checkSelect(checkBox) { |
Line 822 sub listStudents {
|
Line 842 sub listStudents {
|
ctr++; |
ctr++; |
} |
} |
} |
} |
sense = "a student or group of students"; |
sense = '$lt{'multiple'}'; |
} else { |
} else { |
if (checkBox.checked) { |
if (checkBox.checked) { |
ctr = 1; |
ctr = 1; |
} |
} |
sense = "the student"; |
sense = '$lt{'single'}'; |
} |
} |
if (ctr == 0) { |
if (ctr == 0) { |
alert("Please select "+sense+" before clicking on the Next button."); |
alert(sense); |
return false; |
return false; |
} |
} |
document.gradesub.submit(); |
document.gradesub.submit(); |
Line 850 LISTJAVASCRIPT
|
Line 870 LISTJAVASCRIPT
|
my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : ''; |
my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : ''; |
my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : ''; |
my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : ''; |
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'. |
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'. |
"\n".$table. |
"\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". |
$gradeTable .= |
'<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". |
&mt('<b>View Problem Text: </b>[_1]', |
'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n". |
'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n". |
'<label><input type="radio" name="vAns" value="all" checked="checked" /> all students </label><br />'."\n". |
'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n". |
' <b>Submissions: </b>'."\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) { |
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 $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status; |
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status; |
$env{'form.Status'} = $saveStatus; |
$env{'form.Status'} = $saveStatus; |
$gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n". |
$submission_options.= |
'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n". |
'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.&mt('last submission only').' </label>'."\n". |
'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n". |
'<label><input type="radio" name="lastSub" value="last" /> '.&mt('last submission & parts info').' </label>'."\n". |
'<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n". |
'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n". |
' <b>Grading Increments:</b> <select name="increment">'. |
'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>'; |
'<option value="1">Whole Points</option>'. |
$gradeTable .= |
'<option value=".5">Half Points</option>'. |
' '. |
'<option value=".25">Quarter Points</option>'. |
&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n"; |
'<option value=".1">Tenths of a Point</option>'. |
|
'</select>'. |
$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(). |
&build_section_inputs(). |
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n". |
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n". |
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n". |
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n". |
Line 886 LISTJAVASCRIPT
|
Line 925 LISTJAVASCRIPT
|
if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) { |
if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) { |
$gradeTable.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n"; |
$gradeTable.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n"; |
} else { |
} else { |
$gradeTable.='<b>Student Status:</b> '. |
$gradeTable.=&mt('<b>Student Status:</b> [_1]', |
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />'; |
&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) '. |
$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". |
'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n". |
'<input type="hidden" name="command" value="processGroup" />'."\n"; |
'<input type="hidden" name="command" value="processGroup" />'."\n"; |
|
|
# checkall buttons |
# checkall buttons |
$gradeTable.=&check_script('gradesub', 'stuinfo'); |
$gradeTable.=&check_script('gradesub', 'stuinfo'); |
$gradeTable.='<input type="button" '."\n". |
$gradeTable.='<input type="button" '."\n". |
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n". |
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n". |
'value="Next->" /> <br />'."\n"; |
'value="'.&mt('Next->').'" /> <br />'."\n"; |
$gradeTable.=&check_buttons(); |
$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); |
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup); |
$gradeTable.='<table border="0"><tr><td bgcolor="#777777">'. |
$gradeTable.= &Apache::loncommon::start_data_table(). |
'<table border="0"><tr bgcolor="#e6ffff">'; |
&Apache::loncommon::start_data_table_header_row(); |
my $loop = 0; |
my $loop = 0; |
while ($loop < 2) { |
while ($loop < 2) { |
$gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'. |
$gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'. |
'<td>'.&nameUserString('header').' Section/Group</td>'; |
'<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>'; |
if ($env{'form.showgrading'} eq 'yes' |
if ($env{'form.showgrading'} eq 'yes' |
&& $submitonly ne 'queued' |
&& $submitonly ne 'queued' |
&& $submitonly ne 'all') { |
&& $submitonly ne 'all') { |
foreach (sort(@$partlist)) { |
foreach my $part (sort(@$partlist)) { |
my $display_part=&get_display_part((split(/_/))[0],$symb); |
my $display_part= |
$gradeTable.='<td><b> Part: '.$display_part. |
&get_display_part((split(/_/,$part))[0],$symb); |
' Status </b></td>'; |
$gradeTable.= |
|
'<th>'.&mt('Part: [_1] Status',$display_part).'</th>'; |
} |
} |
} elsif ($submitonly eq 'queued') { |
} elsif ($submitonly eq 'queued') { |
$gradeTable.='<td><b> '.&mt('Queue Status').' </b></td>'; |
$gradeTable.='<th>'.&mt('Queue Status').' </th>'; |
} |
} |
$loop++; |
$loop++; |
# $gradeTable.='<td></td>' if ($loop%2 ==1); |
# $gradeTable.='<td></td>' if ($loop%2 ==1); |
} |
} |
$gradeTable.='</tr>'."\n"; |
$gradeTable.=&Apache::loncommon::end_data_table_header_row()."\n"; |
|
|
my $ctr = 0; |
my $ctr = 0; |
foreach my $student (sort |
foreach my $student (sort |
Line 978 LISTJAVASCRIPT
|
Line 1018 LISTJAVASCRIPT
|
my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()]; |
my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()]; |
my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()]; |
my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()]; |
if ( $perm{'vgr'} eq 'F' ) { |
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>'. |
$gradeTable.='<td align="right">'.$ctr.' </td>'. |
'<td align="center"><label><input type=checkbox name="stuinfo" value="'. |
'<td align="center"><label><input type=checkbox name="stuinfo" value="'. |
$student.':'.$$fullname{$student}.':::SECTION'.$section. |
$student.':'.$$fullname{$student}.':::SECTION'.$section. |
') " /> </label></td>'."\n".'<td>'. |
') " /> </label></td>'."\n".'<td>'. |
&nameUserString(undef,$$fullname{$student},$uname,$udom). |
&nameUserString(undef,$$fullname{$student},$uname,$udom). |
' '.$section.'/'.$group.'</td>'."\n"; |
' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n"; |
|
|
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
foreach (sort keys(%status)) { |
foreach (sort keys(%status)) { |
next if (/^resource.*?submitted_by$/); |
next if ($_ =~ /^resource.*?submitted_by$/); |
$gradeTable.='<td align="center"> '.$status{$_}.' </td>'."\n"; |
$gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n"; |
} |
} |
} |
} |
# $gradeTable.='<td></td>' if ($ctr%2 ==1); |
# $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) { |
if ($ctr%2 ==1) { |
Line 1007 LISTJAVASCRIPT
|
Line 1051 LISTJAVASCRIPT
|
} elsif ($submitonly eq 'queued') { |
} elsif ($submitonly eq 'queued') { |
$gradeTable.='<td> </td>'; |
$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" '. |
'<input type="button" '. |
'onClick="javascript:checkSelect(this.form.stuinfo);" '. |
'onClick="javascript:checkSelect(this.form.stuinfo);" '. |
'value="Next->" /></form>'."\n"; |
'value="'.&mt('Next->').'" /></form>'."\n"; |
if ($ctr == 0) { |
if ($ctr == 0) { |
my $num_students=(scalar(keys(%$fullname))); |
my $num_students=(scalar(keys(%$fullname))); |
if ($num_students eq 0) { |
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 { |
} else { |
my $submissions='submissions'; |
my $submissions='submissions'; |
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; } |
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; } |
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; } |
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; } |
if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; } |
if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; } |
$gradeTable='<br /> <span class="LC_warning">'. |
$gradeTable='<br /> <span class="LC_warning">'. |
'No '.$submissions.' found for this resource for any students. ('.$num_students. |
&mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')', |
' students checked for '.$submissions.')</span><br />'; |
$num_students). |
|
'</span><br />'; |
} |
} |
} elsif ($ctr == 1) { |
} elsif ($ctr == 1) { |
$gradeTable =~ s/type=checkbox/type=checkbox checked/; |
$gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/; |
} |
} |
$gradeTable.=&show_grading_menu_form($symb); |
$gradeTable.=&show_grading_menu_form($symb); |
$request->print($gradeTable); |
$request->print($gradeTable); |
Line 1075 sub check_script {
|
Line 1120 sub check_script {
|
} |
} |
|
|
sub check_buttons { |
sub check_buttons { |
my $buttons.='<input type="button" onclick="checkall()" value="Check All" />'; |
my $buttons.='<input type="button" onclick="checkall()" value="'.&mt('Check All').'" />'; |
$buttons.='<input type="button" onclick="uncheckall()" value="Uncheck All" /> '; |
$buttons.='<input type="button" onclick="uncheckall()" value="'.&mt('Uncheck All').'" /> '; |
$buttons.='<input type="button" onclick="checksec()" value="Check Section/Group" />'; |
$buttons.='<input type="button" onclick="checksec()" value="'.&mt('Check Section/Group').'" />'; |
$buttons.='<input type="text" size="5" name="chksec" /> '; |
$buttons.='<input type="text" size="5" name="chksec" /> '; |
return $buttons; |
return $buttons; |
} |
} |
Line 1612 sub get_increment {
|
Line 1657 sub get_increment {
|
sub gradeBox { |
sub gradeBox { |
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_; |
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_; |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
'" src="'.$request->dir_config('lonIconsURL'). |
'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />'; |
'/check.gif" height="16" border="0" />'; |
|
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname); |
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname); |
my $wgtmsg = ($wgt > 0) ? &mt('(problem weight)') |
my $wgtmsg = ($wgt > 0) ? &mt('(problem weight)') |
: '<span class="LC_info">'.&mt('problem weight assigned by computer').'</span>'; |
: '<span class="LC_info">'.&mt('problem weight assigned by computer').'</span>'; |
Line 1628 sub gradeBox {
|
Line 1672 sub gradeBox {
|
if ($last_resets{$partid}) { |
if ($last_resets{$partid}) { |
$aggtries = &get_num_tries($record,$last_resets{$partid},$partid); |
$aggtries = &get_num_tries($record,$last_resets{$partid},$partid); |
} |
} |
$result.='<table border="0"><tr><td>'. |
$result.='<table border="0"><tr>'; |
'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n"; |
|
my $ctr = 0; |
my $ctr = 0; |
my $thisweight = 0; |
my $thisweight = 0; |
my $increment = &get_increment(); |
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) { |
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.'\','. |
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','. |
$thisweight.')" value="'.$thisweight.'" '. |
$thisweight.')" value="'.$thisweight.'" '. |
($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n"; |
($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; |
$thisweight += $increment; |
$ctr++; |
$ctr++; |
} |
} |
$result.='</tr></table>'; |
$radio.='</tr></table>'; |
$result.='</td><td> <b>or</b> </td>'."\n"; |
|
$result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'. |
my $line.='<input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'. |
($score ne ''? ' value = "'.$score.'"':'').' size="4" '. |
($score ne ''? ' value = "'.$score.'"':'').' size="4" '. |
'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','. |
'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','. |
$wgt.')" /></td>'."\n"; |
$wgt.')" /></td>'."\n"; |
$result.='<td>/'.$wgt.' '.$wgtmsg. |
$line.='<td>/'.$wgt.' '.$wgtmsg. |
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : ''). |
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : ''). |
' </td><td>'."\n"; |
' </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"; |
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n"; |
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') { |
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') { |
$result.='<option></option>'. |
$line.='<option></option>'. |
'<option selected="selected">excused</option>'; |
'<option value="excused" selected="selected">'.&mt('excused').'</option>'; |
} else { |
} else { |
$result.='<option selected="selected"></option>'. |
$line.='<option selected="selected"></option>'. |
'<option>excused</option>'; |
'<option value="excused" >'.&mt('excused').'</option>'; |
} |
} |
$result.='<option>reset status</option></select>'."\n"; |
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n"; |
$result.=" \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". |
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n". |
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n". |
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n". |
'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'. |
'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'. |
Line 1671 sub gradeBox {
|
Line 1721 sub gradeBox {
|
$$record{'resource.'.$partid.'.tries'}.'" />'."\n". |
$$record{'resource.'.$partid.'.tries'}.'" />'."\n". |
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'. |
'<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'. |
$aggtries.'" />'."\n"; |
$aggtries.'" />'."\n"; |
$result.='</td></tr></table>'."\n"; |
|
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record); |
$result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record); |
return $result; |
return $result; |
} |
} |
Line 1703 sub handback_box {
|
Line 1752 sub handback_box {
|
'<span class="LC_filename">'.$file_disp.'</span>'); |
'<span class="LC_filename">'.$file_disp.'</span>'); |
$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n"; |
$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n"; |
$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />'; |
$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++; |
$file_counter++; |
} |
} |
} |
} |
Line 1849 sub submission {
|
Line 1898 sub submission {
|
if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) { |
if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) { |
&download_all_link($request, $symb); |
&download_all_link($request, $symb); |
} |
} |
$request->print('<h3> <span class="LC_info">Submission Record</span></h3>'."\n". |
$request->print('<h3> <span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n". |
'<h4> <b>Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n"); |
'<h4> '.&mt('<b>Resource: </b> [_1]',$env{'form.probTitle'}).'</h4>'."\n"); |
|
|
# option to display problem, only once else it cause problems |
# option to display problem, only once else it cause problems |
# with the form later since the problem has a form. |
# with the form later since the problem has a form. |
Line 1969 KEYWORDS
|
Line 2018 KEYWORDS
|
$mode='answer'; |
$mode='answer'; |
} |
} |
&Apache::lonxml::clear_problem_counter(); |
&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); |
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname); |
Line 2215 KEYWORDS
|
Line 2264 KEYWORDS
|
# print end of form |
# print end of form |
if ($counter == $total) { |
if ($counter == $total) { |
my $endform='<table border="0"><tr><td>'."\n"; |
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\','. |
'onClick="javascript:checksubmit(this.form,\'Save & Next\','. |
$total.','.scalar(@partlist).');" target="_self" /> '."\n"; |
$total.','.scalar(@partlist).');" target="_self" /> '."\n"; |
my $ntstu ='<select name="NTSTU">'. |
my $ntstu ='<select name="NTSTU">'. |
Line 2224 KEYWORDS
|
Line 2273 KEYWORDS
|
'<option>7</option><option>10</option></select>'."\n"; |
'<option>7</option><option>10</option></select>'."\n"; |
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1'); |
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1'); |
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</; |
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</; |
$endform.=$ntstu.'student(s) '; |
$endform.=&mt('[_1]student(s)',$ntstu); |
$endform.='<input type="button" value="Previous" '. |
$endform.=' <input type="button" value="'.&mt('Previous').'" '. |
'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> '."\n". |
'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" /> '; |
'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(). |
$endform.="<input type='hidden' value='".&get_increment(). |
"' name='increment' />"; |
"' name='increment' />"; |
$endform.='</td><tr></table></form>'; |
$endform.='</td></tr></table></form>'; |
$endform.=&show_grading_menu_form($symb); |
$endform.=&show_grading_menu_form($symb); |
$request->print($endform); |
$request->print($endform); |
} |
} |
Line 2571 sub processHandGrade {
|
Line 2620 sub processHandGrade {
|
$ctr++; |
$ctr++; |
} |
} |
if ($total < 0) { |
if ($total < 0) { |
my $the_end = '<h3><span class="LC_info">LON-CAPA User Message</span></h3><br />'."\n"; |
my $the_end = '<h3><span class="LC_info">'.&mt('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.=&mt('<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"; |
$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n"; |
$the_end.=&show_grading_menu_form($symb); |
$the_end.=&show_grading_menu_form($symb); |
$request->print($the_end); |
$request->print($the_end); |
} |
} |
Line 3144 sub viewgrades {
|
Line 3193 sub viewgrades {
|
&Apache::lonnet::clear_EXT_cache_status(); |
&Apache::lonnet::clear_EXT_cache_status(); |
|
|
my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'; |
my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'; |
$result.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n"; |
$result.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n"; |
|
|
#view individual student submission form - called using Javascript viewOneStudent |
#view individual student submission form - called using Javascript viewOneStudent |
$result.=&jscriptNform($symb); |
$result.=&jscriptNform($symb); |
Line 3162 sub viewgrades {
|
Line 3211 sub viewgrades {
|
my $sectionClass; |
my $sectionClass; |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
if ($env{'form.section'} eq 'all') { |
if ($env{'form.section'} eq 'all') { |
$sectionClass='Class </h3>'; |
$sectionClass='Class'; |
} elsif ($env{'form.section'} eq 'none') { |
} elsif ($env{'form.section'} eq 'none') { |
$sectionClass=&mt('Students in no Section').'</h3>'; |
$sectionClass='Students in no Section'; |
} else { |
} 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.= |
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n". |
'<h3>'. |
'<table border=0><tr bgcolor="#ffffdd"><td>'; |
&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. |
#radio buttons/text box for assigning points for a section or class. |
#handles different parts of a problem |
#handles different parts of a problem |
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my %weight = (); |
my %weight = (); |
my $ctsparts = 0; |
my $ctsparts = 0; |
$result.='<table border="0">'; |
|
my %seen = (); |
my %seen = (); |
my @part_response_id = &flatten_responseType($responseType); |
my @part_response_id = &flatten_responseType($responseType); |
foreach my $part_response_id (@part_response_id) { |
foreach my $part_response_id (@part_response_id) { |
Line 3188 sub viewgrades {
|
Line 3237 sub viewgrades {
|
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb); |
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb); |
$weight{$partid} = $wgt eq '' ? '1' : $wgt; |
$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); |
my $display_part=&get_display_part($partid,$symb); |
$result.='<tr><td><b>Part:</b> '.$display_part.' <b>Point:</b> </td><td>'; |
my $radio.='<table border="0"><tr>'; |
$result.='<table border="0"><tr>'; |
|
my $ctr = 0; |
my $ctr = 0; |
while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across |
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}. |
'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}. |
','.$ctr.')" />'.$ctr."</label></td>\n"; |
','.$ctr.')" />'.$ctr."</label></td>\n"; |
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : ''); |
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : ''); |
$ctr++; |
$ctr++; |
} |
} |
$result.='</tr></table>'; |
$radio.='</tr></table>'; |
$result.= '</td><td><b> or </b><input type="text" name="TEXTVAL_'. |
my $line = '<input type="text" name="TEXTVAL_'. |
$partid.'" size="4" '.'onChange="javascript:writePoint(\''. |
$partid.'" size="4" '.'onChange="javascript:writePoint(\''. |
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'. |
$partid.'\','.$weight{$partid}.',\'textval\')" /> /'. |
$weight{$partid}.' (problem weight)</td>'."\n"; |
$weight{$partid}.' (problem weight)</td>'."\n"; |
$result.= '</td><td><select name="SELVAL_'.$partid.'"'. |
$line.= '<td><select name="SELVAL_'.$partid.'"'. |
'onChange="javascript:writeRadText(\''.$partid.'\','. |
'onChange="javascript:writeRadText(\''.$partid.'\','. |
$weight{$partid}.')"> '. |
$weight{$partid}.')"> '. |
'<option selected="selected"> </option>'. |
'<option selected="selected"> </option>'. |
'<option>excused</option>'. |
'<option value="excused">'.&mt('excused').'</option>'. |
'<option>reset status</option></select></td>'. |
'<option value="reset status">'.&mt('reset status').'</option>'. |
'<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n"; |
'</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++; |
$ctsparts++; |
} |
} |
$result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n". |
$result.=&Apache::loncommon::end_data_table()."\n". |
'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />'; |
'<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.');" target="_self" />'; |
'onClick="javascript:resetEntry('.$ctsparts.');" />'; |
|
|
#table listing all the students in a section/class |
#table listing all the students in a section/class |
#header of table |
#header of table |
$result.= '<h3>Assign Grade to Specific Students in '.$sectionClass; |
$result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass, |
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n". |
$section_display).'</h3>'; |
'<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'. |
$result.= &Apache::loncommon::start_data_table(). |
'<td>'.&nameUserString('header')."</td>\n"; |
&Apache::loncommon::start_data_table_header_row(). |
|
'<th>'.&mt('No.').'</th>'. |
|
'<th>'.&nameUserString('header')."</th>\n"; |
my (@parts) = sort(&getpartlist($symb)); |
my (@parts) = sort(&getpartlist($symb)); |
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
my @partids = (); |
my @partids = (); |
Line 3239 sub viewgrades {
|
Line 3295 sub viewgrades {
|
push(@partids, $partid); |
push(@partids, $partid); |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
if ($display =~ /^Partial Credit Factor/) { |
if ($display =~ /^Partial Credit Factor/) { |
$result.='<td><b>Score Part:</b> '.$display_part. |
$result.='<th>'. |
' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n"; |
&mt('Score Part: [_1]<br /> (weight = [_2])', |
|
$display_part,$weight{$partid}).'</th>'."\n"; |
next; |
next; |
|
|
} else { |
} 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 = |
my %last_resets = |
&get_last_resets($symb,$env{'request.course.id'},\@partids); |
&get_last_resets($symb,$env{'request.course.id'},\@partids); |
Line 3268 sub viewgrades {
|
Line 3331 sub viewgrades {
|
$result.=&viewstudentgrade($symb,$env{'request.course.id'}, |
$result.=&viewstudentgrade($symb,$env{'request.course.id'}, |
$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets); |
$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets); |
} |
} |
$result.='</table></td></tr></table>'; |
$result.=&Apache::loncommon::end_data_table(); |
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n"; |
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n"; |
$result.='<input type="button" value="Save" '. |
$result.='<input type="button" value="'.&mt('Save').'" '. |
'onClick="javascript:submit();" target="_self" /></form>'."\n"; |
'onClick="javascript:submit();" target="_self" /></form>'."\n"; |
if (scalar(%$fullname) eq 0) { |
if (scalar(%$fullname) eq 0) { |
my $colspan=3+scalar(@parts); |
my $colspan=3+scalar(@parts); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status')); |
$result='<span class="LC_warning">'. |
$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). |
$section_display, $stu_status). |
'</span>'; |
'</span>'; |
} |
} |
Line 3291 sub viewstudentgrade {
|
Line 3354 sub viewstudentgrade {
|
my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname); |
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname); |
my %aggregates = (); |
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.'" />'. |
'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'. |
"\n".$ctr.' </td><td> '. |
"\n".$ctr.' </td><td> '. |
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
Line 3333 sub viewstudentgrade {
|
Line 3396 sub viewstudentgrade {
|
$result.=' <select name="'. |
$result.=' <select name="'. |
'GD_'.$student.'_'.$part.'_solved" '. |
'GD_'.$student.'_'.$part.'_solved" '. |
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n"; |
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n"; |
$result.= (($status eq 'excused') ? '<option> </option><option selected="selected">excused</option>' |
$result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>' |
: '<option selected="selected"> </option><option>excused</option>')."\n"; |
: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n"; |
$result.='<option>reset status</option>'; |
$result.='<option value="reset status">'.&mt('reset status').'</option>'; |
$result.="</select> </td>\n"; |
$result.="</select> </td>\n"; |
} else { |
} else { |
$result.='<input type="hidden" name="'. |
$result.='<input type="hidden" name="'. |
Line 3346 sub viewstudentgrade {
|
Line 3409 sub viewstudentgrade {
|
'value="'.$score.'" size="4" /></td>'."\n"; |
'value="'.$score.'" size="4" /></td>'."\n"; |
} |
} |
} |
} |
$result.='</tr>'; |
$result.=&Apache::loncommon::end_data_table_row(); |
return $result; |
return $result; |
} |
} |
|
|
Line 3357 sub editgrades {
|
Line 3420 sub editgrades {
|
|
|
my $symb=&get_symb($request); |
my $symb=&get_symb($request); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section')); |
my $title='<h3><span class="LC_info">'.&mt('Current Grade Status').'</span></h3>'; |
my $title='<h2>'.&mt('Current Grade Status').'</h2>'; |
$title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4><br />'."\n"; |
$title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n"; |
$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n"; |
$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n"; |
|
|
my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n"; |
my $result= &Apache::loncommon::start_data_table(). |
$result.= '<table border="0"><tr bgcolor="#deffff">'. |
&Apache::loncommon::start_data_table_header_row(). |
'<td rowspan=2 valign="center"> <b>No.</b> </td>'. |
'<th rowspan="2" valign="middle">'.&mt('No.').'</th>'. |
'<td rowspan=2 valign="center">'.&nameUserString('header')."</td>\n"; |
'<th rowspan="2" valign="middle">'.&nameUserString('header')."</th>\n"; |
|
|
my %scoreptr = ( |
my %scoreptr = ( |
'correct' =>'correct_by_override', |
'correct' =>'correct_by_override', |
'incorrect'=>'incorrect_by_override', |
'incorrect'=>'incorrect_by_override', |
Line 3390 sub editgrades {
|
Line 3452 sub editgrades {
|
} |
} |
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb); |
foreach my $partid (@partid) { |
foreach my $partid (@partid) { |
$header .= '<td align="center"> <b>Old Score</b> </td>'. |
$header .= '<th align="center">'.&mt('Old Score').'</th>'. |
'<td align="center"> <b>New Score</b> </td>'; |
'<th align="center">'.&mt('New Score').'</th>'; |
$columns{$partid}=2; |
$columns{$partid}=2; |
foreach my $stores (@parts) { |
foreach my $stores (@parts) { |
my ($part,$type) = &split_part_type($stores); |
my ($part,$type) = &split_part_type($stores); |
Line 3400 sub editgrades {
|
Line 3462 sub editgrades {
|
my $display=&Apache::lonnet::metadata($url,$stores.'.display'); |
my $display=&Apache::lonnet::metadata($url,$stores.'.display'); |
$display =~ s/\[Part: (\w)+\]//; |
$display =~ s/\[Part: (\w)+\]//; |
$display =~ s/Number of Attempts/Tries/; |
$display =~ s/Number of Attempts/Tries/; |
$header .= '<td align="center"> <b>Old '.$display.'</b> </td>'. |
$header .= '<th align="center">'.&mt('Old '.$display).'</th>'. |
'<td align="center"> <b>New '.$display.'</b> </td>'; |
'<th align="center">'.&mt('New '.$display).'</th>'; |
$columns{$partid}+=2; |
$columns{$partid}+=2; |
} |
} |
} |
} |
foreach my $partid (@partid) { |
foreach my $partid (@partid) { |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
$result .= '<td colspan="'.$columns{$partid}. |
$result .= '<th colspan="'.$columns{$partid}.'" align="center">'. |
'" align="center"><b>Part:</b> '.$display_part. |
&mt('Part: [_1] (Weight = [_2])',$display_part,$weight{$partid}). |
' (Weight = '.$weight{$partid}.')</td>'; |
'</th>'; |
|
|
} |
} |
$result .= '</tr><tr bgcolor="#deffff">'; |
$result .= &Apache::loncommon::end_data_table_header_row(). |
$result .= $header; |
&Apache::loncommon::start_data_table_header_row(). |
$result .= '</tr>'."\n"; |
$header. |
my $noupdate; |
&Apache::loncommon::end_data_table_header_row(); |
|
my @noupdate; |
my ($updateCtr,$noupdateCtr) = (1,1); |
my ($updateCtr,$noupdateCtr) = (1,1); |
for ($i=0; $i<$env{'form.total'}; $i++) { |
for ($i=0; $i<$env{'form.total'}; $i++) { |
my $line; |
my $line; |
Line 3427 sub editgrades {
|
Line 3490 sub editgrades {
|
my $usec=$classlist->{"$uname:$udom"}[5]; |
my $usec=$classlist->{"$uname:$udom"}[5]; |
if (!&canmodify($usec)) { |
if (!&canmodify($usec)) { |
my $numcols=scalar(@partid)*4+2; |
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; |
next; |
} |
} |
my %aggregate = (); |
my %aggregate = (); |
Line 3496 sub editgrades {
|
Line 3561 sub editgrades {
|
'<td align="center">'.$awarded.' </td>'; |
'<td align="center">'.$awarded.' </td>'; |
} |
} |
} |
} |
$line.='</tr>'."\n"; |
$line.="\n"; |
|
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
Line 3529 sub editgrades {
|
Line 3594 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++; |
$updateCtr++; |
} else { |
} else { |
$noupdate.='<tr bgcolor="#ffffde"><td align="right"> '.$noupdateCtr.' </td>'.$line; |
push(@noupdate, |
|
'<td align="right"> '.$noupdateCtr.' </td>'.$line); |
$noupdateCtr++; |
$noupdateCtr++; |
} |
} |
if ($aggregateflag) { |
if ($aggregateflag) { |
Line 3540 sub editgrades {
|
Line 3608 sub editgrades {
|
$cdom,$cnum); |
$cdom,$cnum); |
} |
} |
} |
} |
if ($noupdate) { |
if (@noupdate) { |
# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3; |
# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3; |
my $numcols=scalar(@partid)*4+2; |
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". |
$result .= &Apache::loncommon::end_data_table(). |
&show_grading_menu_form ($symb); |
&show_grading_menu_form($symb); |
my $msg = '<br /><b>Number of records updated = '.$rec_update. |
my $msg = '<p><b>'. |
' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'. |
&mt('Number of records updated = [_1] for [quant,_2,student].', |
'<b>Total number of students = '.$env{'form.total'}.'</b><br />'; |
$rec_update,$count).'</b><br />'. |
|
'<b>'.&mt('Total number of students = [_1]',$env{'form.total'}). |
|
'</b></p>'; |
return $title.$msg.$result; |
return $title.$msg.$result; |
} |
} |
|
|
Line 4026 LISTJAVASCRIPT
|
Line 4106 LISTJAVASCRIPT
|
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
|
|
my $result='<h3><span class="LC_info"> '. |
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.='<form action="/adm/grades" method="post" name="displayPage">'."\n"; |
$result.=' <b>Problems from:</b> <select name="selectpage">'."\n"; |
|
my ($titles,$symbx) = &getSymbMap(); |
my ($titles,$symbx) = &getSymbMap(); |
my ($curpage) =&Apache::lonnet::decode_symb($symb); |
my ($curpage) =&Apache::lonnet::decode_symb($symb); |
# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); |
# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); |
# my $type=($curpage =~ /\.(page|sequence)/); |
# my $type=($curpage =~ /\.(page|sequence)/); |
|
my $select = '<select name="selectpage">'."\n"; |
my $ctr=0; |
my $ctr=0; |
foreach (@$titles) { |
foreach (@$titles) { |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
$result.='<option value="'.$ctr.'" '. |
$select.='<option value="'.$ctr.'" '. |
($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : ''). |
($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : ''). |
'>'.$showtitle.'</option>'."\n"; |
'>'.$showtitle.'</option>'."\n"; |
$ctr++; |
$ctr++; |
} |
} |
$result.= '</select>'."<br />\n"; |
$select.= '</select>'; |
|
$result.=&mt(' <b>Problems from:</b> [_1]',$select)."<br />\n"; |
|
|
$ctr=0; |
$ctr=0; |
foreach (@$titles) { |
foreach (@$titles) { |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
Line 4053 LISTJAVASCRIPT
|
Line 4135 LISTJAVASCRIPT
|
$result.='<input type="hidden" name="page" />'."\n". |
$result.='<input type="hidden" name="page" />'."\n". |
'<input type="hidden" name="title" />'."\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". |
my $options = |
'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n"; |
'<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.=' <b>Submission Details: </b>'. |
$result.=' '.&mt('<b>View Problems Text: </b> [_1]',$options); |
'<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". |
$options = |
'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n"; |
'<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.=&build_section_inputs(); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status')); |
Line 4068 LISTJAVASCRIPT
|
Line 4153 LISTJAVASCRIPT
|
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n"; |
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n"; |
|
|
$result.=' <b>'.&mt('Use CODE:').' </b>'. |
$result.=' '.&mt('<b>Use CODE: [_1] </b>', |
'<input type="text" name="CODE" value="" /><br />'."\n"; |
'<input type="text" name="CODE" value="" />'). |
|
'<br />'."\n"; |
|
|
$result.=' <input type="button" '. |
$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); |
$request->print($result); |
|
|
my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br />'. |
my $studentTable.=' <b>'.&mt('Select a student you wish to grade and then click on the Next button.').'</b><br />'. |
'<table border="0"><tr><td bgcolor="#777777">'. |
&Apache::loncommon::start_data_table(). |
'<table border="0"><tr bgcolor="#e6ffff">'. |
&Apache::loncommon::start_data_table_header_row(). |
'<td align="right"> <b>No.</b></td>'. |
'<th align="right"> '.&mt('No.').'</th>'. |
'<td>'.&nameUserString('header').'</td>'. |
'<th>'.&nameUserString('header').'</th>'. |
'<td align="right"> <b>No.</b></td>'. |
'<th align="right"> '.&mt('No.').'</th>'. |
'<td>'.&nameUserString('header').'</td></tr>'; |
'<th>'.&nameUserString('header').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row(); |
|
|
my (undef,undef,$fullname) = &getclasslist($getsec,'1'); |
my (undef,undef,$fullname) = &getclasslist($getsec,'1'); |
my $ptr = 1; |
my $ptr = 1; |
Line 4094 LISTJAVASCRIPT
|
Line 4181 LISTJAVASCRIPT
|
return $a cmp $b; |
return $a cmp $b; |
} (keys(%$fullname))) { |
} (keys(%$fullname))) { |
my ($uname,$udom) = split(/:/,$student); |
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 align="right">'.$ptr.' </td>'; |
$studentTable.='<td> <label><input type="radio" name="student" value="'.$student.'" /> ' |
$studentTable.='<td> <label><input type="radio" name="student" value="'.$student.'" /> ' |
.&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n"; |
.&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++; |
$ptr++; |
} |
} |
$studentTable.='</td><td> </td><td> </td></tr>' if ($ptr%2 == 0); |
if ($ptr%2 == 0) { |
$studentTable.='</table></td></tr></table>'."\n"; |
$studentTable.='</td><td> </td><td> </td>'. |
|
&Apache::loncommon::end_data_table_row(); |
|
} |
|
$studentTable.=&Apache::loncommon::end_data_table()."\n"; |
$studentTable.='<input type="button" '. |
$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); |
$studentTable.=&show_grading_menu_form($symb); |
$request->print($studentTable); |
$request->print($studentTable); |
Line 4156 sub displayPage {
|
Line 4249 sub displayPage {
|
&Apache::lonnet::clear_EXT_cache_status(); |
&Apache::lonnet::clear_EXT_cache_status(); |
|
|
if (!&canview($usec)) { |
if (!&canview($usec)) { |
$request->print('<span class="LC_warning">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)); |
$request->print(&show_grading_menu_form($symb)); |
return; |
return; |
} |
} |
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
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"; |
'</h3>'."\n"; |
if (&Apache::lonnet::validCODE($env{'form.CODE'})) { |
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 { |
} else { |
delete($env{'form.CODE'}); |
delete($env{'form.CODE'}); |
} |
} |
Line 4175 sub displayPage {
|
Line 4268 sub displayPage {
|
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'}); |
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'}); |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
if (!$map) { |
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)); |
$request->print(&show_grading_menu_form($symb)); |
return; |
return; |
} |
} |
Line 4197 sub displayPage {
|
Line 4290 sub displayPage {
|
'<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n"; |
'<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n"; |
} |
} |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
my $checkIcon = '<img alt="'.&mt('Check Mark'). |
'" src="'.$request->dir_config('lonIconsURL'). |
'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />'; |
'/check.gif" height="16" border="0" />'; |
|
|
|
$studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon. |
$studentTable.=' '.&mt('<b>Note:</b> Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n". |
' symbol.'."\n". |
&Apache::loncommon::start_data_table(). |
'<table border="0"><tr><td bgcolor="#777777">'. |
&Apache::loncommon::start_data_table_header_row(). |
'<table border="0"><tr bgcolor="#e6ffff">'. |
'<th align="center"> Prob. </th>'. |
'<td align="center"><b> Prob. </b></td>'. |
'<th> '.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'. |
'<td><b> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>'; |
&Apache::loncommon::end_data_table_header_row(); |
|
|
&Apache::lonxml::clear_problem_counter(); |
&Apache::lonxml::clear_problem_counter(); |
my ($depth,$question,$prob) = (1,1,1); |
my ($depth,$question,$prob) = (1,1,1); |
Line 4219 sub displayPage {
|
Line 4311 sub displayPage {
|
my $parts = $curRes->parts(); |
my $parts = $curRes->parts(); |
my $title = $curRes->compTitle(); |
my $title = $curRes->compTitle(); |
my $symbx = $curRes->symb(); |
my $symbx = $curRes->symb(); |
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob. |
$studentTable.= |
(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>'; |
&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">'; |
$studentTable.='<td valign="top">'; |
my %form = ('CODE' => $env{'form.CODE'},); |
my %form = ('CODE' => $env{'form.CODE'},); |
if ($env{'form.vProb'} eq 'yes' ) { |
if ($env{'form.vProb'} eq 'yes' ) { |
Line 4235 sub displayPage {
|
Line 4333 sub displayPage {
|
# $request->print('match='.$1."<br />\n"); |
# $request->print('match='.$1."<br />\n"); |
# } |
# } |
# $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g; |
# $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); |
my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname); |
|
|
if ($env{'form.lastSub'} eq 'datesub') { |
if ($env{'form.lastSub'} eq 'datesub') { |
if ($record{'version'} eq '') { |
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 { |
} else { |
my %responseType = (); |
my %responseType = (); |
foreach my $partid (@{$parts}) { |
foreach my $partid (@{$parts}) { |
Line 4278 sub displayPage {
|
Line 4376 sub displayPage {
|
$curRes = $iterator->next(); |
$curRes = $iterator->next(); |
} |
} |
|
|
$studentTable.='</table></td></tr></table>'."\n". |
$studentTable.='</table>'."\n". |
'<input type="button" value="Save" '. |
'<input type="button" value="'.&mt('Save').'" '. |
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'. |
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'. |
'</form>'."\n"; |
'</form>'."\n"; |
$studentTable.=&show_grading_menu_form($symb); |
$studentTable.=&show_grading_menu_form($symb); |
Line 4359 sub displaySubByDates {
|
Line 4457 sub displaySubByDates {
|
} |
} |
} |
} |
if (exists($$record{"$where.$partid.checkedin"})) { |
if (exists($$record{"$where.$partid.checkedin"})) { |
$displaySub[1].='Checked in by '. |
$displaySub[1].=&mt('Checked in by [_1] into slot [_2]', |
$$record{"$where.$partid.checkedin"}.' into slot '. |
$$record{"$where.$partid.checkedin"}, |
$$record{"$where.$partid.checkedin.slot"}. |
$$record{"$where.$partid.checkedin.slot"}). |
'<br />'; |
'<br />'; |
} |
} |
if (exists $$record{"$where.$partid.award"}) { |
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"}).' '. |
lc($$record{"$where.$partid.award"}).' '. |
$mark{$$record{"$where.$partid.solved"}}. |
$mark{$$record{"$where.$partid.solved"}}. |
'<br />'; |
'<br />'; |
Line 4427 sub updateGradeByPage {
|
Line 4525 sub updateGradeByPage {
|
my $iterator = $navmap->getIterator($map->map_start(), |
my $iterator = $navmap->getIterator($map->map_start(), |
$map->map_finish()); |
$map->map_finish()); |
|
|
my $studentTable='<table border="0"><tr><td bgcolor="#777777">'. |
my $studentTable= |
'<table border="0"><tr bgcolor="#e6ffff">'. |
&Apache::loncommon::start_data_table(). |
'<td align="center"><b> Prob. </b></td>'. |
&Apache::loncommon::start_data_table_header_row(). |
'<td><b> Title </b></td>'. |
'<th align="center"> '.&mt('Prob.').' </th>'. |
'<td><b> Previous Score </b></td>'. |
'<th> '.&mt('Title').' </th>'. |
'<td><b> New Score </b></td></tr>'; |
'<th> '.&mt('Previous Score').' </th>'. |
|
'<th> '.&mt('New Score').' </th>'. |
|
&Apache::loncommon::end_data_table_header_row(); |
|
|
$iterator->next(); # skip the first BEGIN_MAP |
$iterator->next(); # skip the first BEGIN_MAP |
my $curRes = $iterator->next(); # for "current resource" |
my $curRes = $iterator->next(); # for "current resource" |
Line 4445 sub updateGradeByPage {
|
Line 4545 sub updateGradeByPage {
|
my $parts = $curRes->parts(); |
my $parts = $curRes->parts(); |
my $title = $curRes->compTitle(); |
my $title = $curRes->compTitle(); |
my $symbx = $curRes->symb(); |
my $symbx = $curRes->symb(); |
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob. |
$studentTable.= |
(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>'; |
&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>'; |
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>'; |
|
|
my %newrecord=(); |
my %newrecord=(); |
Line 4533 sub updateGradeByPage {
|
Line 4637 sub updateGradeByPage {
|
|
|
$studentTable.='<td valign="top">'.$displayPts[0].'</td>'. |
$studentTable.='<td valign="top">'.$displayPts[0].'</td>'. |
'<td valign="top">'.$displayPts[1].'</td>'. |
'<td valign="top">'.$displayPts[1].'</td>'. |
'</tr>'; |
&Apache::loncommon::end_data_table_row(); |
|
|
$prob++; |
$prob++; |
} |
} |
$curRes = $iterator->next(); |
$curRes = $iterator->next(); |
} |
} |
|
|
$studentTable.='</td></tr></table></td></tr></table>'; |
$studentTable.=&Apache::loncommon::end_data_table(); |
$studentTable.=&show_grading_menu_form($env{'form.symb'}); |
$studentTable.=&show_grading_menu_form($env{'form.symb'}); |
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' : |
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' : |
'The scores were changed for '. |
'The scores were changed for '. |
Line 4797 sub scantron_selectphase {
|
Line 4901 sub scantron_selectphase {
|
|
|
# Chunk of form to prompt for a file to grade and how: |
# Chunk of form to prompt for a file to grade and how: |
|
|
$result.= <<SCANTRONFORM; |
$result.= ' |
<table width="100%" border="0"> |
<br /> |
<tr> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process"> |
<input type="hidden" name="command" value="scantron_warning" /> |
<td bgcolor="#777777"> |
'.$default_form_data.' |
<input type="hidden" name="command" value="scantron_warning" /> |
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
$default_form_data |
'.&Apache::loncommon::start_data_table_header_row().' |
<table width="100%" border="0"> |
<th colspan="2"> |
<tr bgcolor="#e6ffff"> |
Specify file and which Folder/Sequence to grade |
<td colspan="2"> |
</th> |
<b>Specify file and which Folder/Sequence to grade</b> |
'.&Apache::loncommon::end_data_table_header_row().' |
</td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> Sequence to grade: </td><td> '.$sequence_selector.' </td> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td> Sequence to grade: </td><td> $sequence_selector </td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> Filename of scoring office file: </td><td> '.$file_selector.' </td> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td> Filename of scoring office file: </td><td> $file_selector </td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> Format of data file: </td><td> '.$format_selector.' </td> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td> Format of data file: </td><td> $format_selector </td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> Saved CODEs to validate against: </td><td> '.$CODE_selector.' </td> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td> Saved CODEs to validate against: </td><td> $CODE_selector</td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
<td> Each CODE is only to be used once:</td><td> '.$CODE_unique.' </td> |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::end_data_table_row().' |
<td> Each CODE is only to be used once:</td><td> $CODE_unique </td> |
'.&Apache::loncommon::start_data_table_row().' |
</tr> |
|
<tr bgcolor="#ffffe6"> |
|
<td> Options: </td> |
<td> Options: </td> |
<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_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_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_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label> |
</td> |
</td> |
</tr> |
'.&Apache::loncommon::end_data_table_row().' |
<tr bgcolor="#ffffe6"> |
'.&Apache::loncommon::start_data_table_row().' |
<td colspan="2"> |
<td colspan="2"> |
<input type="submit" value="Grading: Validate Scantron Records" /> |
<input type="submit" value="Grading: Validate Scantron Records" /> |
</td> |
</td> |
</tr> |
'.&Apache::loncommon::end_data_table_row().' |
</table> |
'.&Apache::loncommon::end_data_table().' |
</td> |
</form> |
</form> |
'; |
</tr> |
|
SCANTRONFORM |
|
|
|
$r->print($result); |
$r->print($result); |
|
|
Line 4851 SCANTRONFORM
|
Line 4951 SCANTRONFORM
|
|
|
# Chunk of form to prompt for a scantron file upload. |
# Chunk of form to prompt for a scantron file upload. |
|
|
$r->print(<<SCANTRONFORM); |
$r->print(' |
<tr> |
<br /> |
<td bgcolor="#777777"> |
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
<table width="100%" border="0"> |
'.&Apache::loncommon::start_data_table_header_row().' |
<tr bgcolor="#e6ffff"> |
<th> |
|
Specify a Scantron data file to upload. |
|
</th> |
|
'.&Apache::loncommon::end_data_table_header_row().' |
|
'.&Apache::loncommon::start_data_table_row().' |
<td> |
<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 $default_form_data=&defaultFormData(&get_symb($r,1)); |
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'}; |
Line 4888 SCANTRONFORM
|
Line 4987 SCANTRONFORM
|
</form> |
</form> |
UPLOAD |
UPLOAD |
|
|
$r->print(<<SCANTRONFORM); |
$r->print(' |
</td> |
</td> |
</tr> |
'.&Apache::loncommon::end_data_table_row().' |
</table> |
'.&Apache::loncommon::end_data_table().' |
</td> |
'); |
</tr> |
|
SCANTRONFORM |
|
} |
} |
|
|
# Chunk of the form that prompts to view a scoring office file, |
# Chunk of the form that prompts to view a scoring office file, |
# corrected file, skipped records in a file. |
# corrected file, skipped records in a file. |
|
|
$r->print(<<SCANTRONFORM); |
$r->print(' |
<tr> |
<br /> |
<form action='/adm/grades' name='scantron_download'> |
<form action="/adm/grades" name="scantron_download"> |
<td bgcolor="#777777"> |
'.$default_form_data.' |
$default_form_data |
<input type="hidden" name="command" value="scantron_download" /> |
<input type="hidden" name="command" value="scantron_download" /> |
'.&Apache::loncommon::start_data_table('LC_scantron_action').' |
<table width="100%" border="0"> |
'.&Apache::loncommon::start_data_table_header_row().' |
<tr bgcolor="#e6ffff"> |
<th> |
<td colspan="2"> |
Download a scoring office file |
<b>Download a scoring office file</b> |
</th> |
</td> |
'.&Apache::loncommon::end_data_table_header_row().' |
</tr> |
'.&Apache::loncommon::start_data_table_row().' |
<tr bgcolor="#ffffe6"> |
<td> Filename of scoring office file: '.$file_selector.' |
<td> Filename of scoring office file: </td><td> $file_selector </td> |
<br /> |
</tr> |
|
<tr bgcolor="#ffffe6"> |
|
<td colspan="2"> |
|
<input type="submit" value="Download: Show List of Associated Files" /> |
<input type="submit" value="Download: Show List of Associated Files" /> |
</td> |
'.&Apache::loncommon::end_data_table_row().' |
</tr> |
'.&Apache::loncommon::end_data_table().' |
</table> |
</form> |
</td> |
<br /> |
</form> |
'); |
</tr> |
|
SCANTRONFORM |
|
|
|
$r->print('<tr><td bgcolor="#777777">'); |
|
&Apache::lonpickcode::code_list($r,2); |
&Apache::lonpickcode::code_list($r,2); |
$r->print('</td></tr></table>'); |
|
$r->print($grading_menu_button); |
$r->print($grading_menu_button); |
return |
return |
} |
} |
Line 5094 sub username_to_idmap {
|
Line 5184 sub username_to_idmap {
|
|
|
sub scantron_fixup_scanline { |
sub scantron_fixup_scanline { |
my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_; |
my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_; |
|
|
|
|
if ($field eq 'ID') { |
if ($field eq 'ID') { |
if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) { |
if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) { |
return ($line,1,'New value too large'); |
return ($line,1,'New value too large'); |
Line 5125 sub scantron_fixup_scanline {
|
Line 5216 sub scantron_fixup_scanline {
|
$$scantron_config{'CODElength'})=$args->{'CODE'}; |
$$scantron_config{'CODElength'})=$args->{'CODE'}; |
} |
} |
} elsif ($field eq 'answer') { |
} 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 $off=$scantron_config->{'Qoff'}; |
my $on=$scantron_config->{'Qon'}; |
my $on=$scantron_config->{'Qon'}; |
my $answer=${off}x$length; |
my $question_number = $args->{'question'} -1; |
if ($args->{'response'} eq 'none') { |
my $first_position = $first_bubble_line{$question_number}; |
&scan_data($scan_data, |
my $bubble_count = $bubble_lines_per_response{$question_number}; |
"$whichline.no_bubble.".$args->{'question'},'1'); |
my $bubbles_per_line= $$scantron_config{'Qlength'}; |
} else { |
my $answer=${off}x($bubbles_per_line*$bubble_count); |
if ($on eq 'letter') { |
my $final_answer; |
my @alphabet=('A'..'Z'); |
if ($$scantron_config{'Qon'} eq 'letter' || |
$answer=$alphabet[$args->{'response'}]; |
$$scantron_config{'Qon'} eq 'number') { |
} elsif ($on eq 'number') { |
$bubbles_per_line = 10; |
$answer=$args->{'response'}+1; |
} |
if ($answer == 10) { $answer = '0'; } |
if (defined $args->{'response'}) { |
|
|
|
if ($args->{'response'} eq 'none') { |
|
&scan_data($scan_data, |
|
"$whichline.no_bubble.".$args->{'question'},'1'); |
} else { |
} 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, |
# $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'}; |
"$whichline.no_bubble.".$args->{'question'},undef,'1'); |
#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; |
return $line; |
} |
} |
Line 5316 sub scantron_parse_scanline {
|
Line 5437 sub scantron_parse_scanline {
|
} elsif (!defined($currentquest) |
} elsif (!defined($currentquest) |
|| (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest)) |
|| (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest)) |
|| (&occurence_count($currentquest, "[A-Z]") == 0)) { |
|| (&occurence_count($currentquest, "[A-Z]") == 0)) { |
&Apache::lonnet::logthis("Missing if, $questnum, $ansnum"); |
|
for (my $ans = 0; $ans < $answers_needed; $ans++ ) { |
for (my $ans = 0; $ans < $answers_needed; $ans++ ) { |
$record{"scantron.$ansnum.answer"}=''; |
$record{"scantron.$ansnum.answer"}=''; |
$ansnum++; |
$ansnum++; |
|
|
} |
} |
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) { |
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) { |
&Apache::lonnet::logthis("Parsed missing: $questnum"); |
|
push(@{$record{"scantron.missingerror"}},$questnum); |
push(@{$record{"scantron.missingerror"}},$questnum); |
# $ansnum += $answers_needed; |
# $ansnum += $answers_needed; |
} |
} |
&Apache::lonnet::logthis("Residual scanline: '$questions'"); |
|
|
|
} else { |
} else { |
for (my $ans = 0; $ans < $answers_needed; $ans++) { |
for (my $ans = 0; $ans < $answers_needed; $ans++) { |
$record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1); |
$record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1); |
Line 5397 sub scantron_parse_scanline {
|
Line 5514 sub scantron_parse_scanline {
|
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) { |
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) { |
push(@{$record{"scantron.missingerror"}},$questnum); |
push(@{$record{"scantron.missingerror"}},$questnum); |
} |
} |
} elsif (scalar(@array) lt 2) { |
|
|
# 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 $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'}]; |
my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}]; |
|
|
|
|
for (my $ans = 0; $ans < $answers_needed; $ans++) { |
for (my $ans = 0; $ans < $answers_needed; $ans++) { |
if ($ans eq $line_num) { |
if ($ans eq $line_num) { |
Line 6487 ENDSCRIPT
|
Line 6609 ENDSCRIPT
|
foreach my $question (@{$arg}) { |
foreach my $question (@{$arg}) { |
my $selected = &get_response_bubbles($scan_record, $question); |
my $selected = &get_response_bubbles($scan_record, $question); |
my @select_array = split(/:/,$selected); # ought to be an array of empties. |
my @select_array = split(/:/,$selected); # ought to be an array of empties. |
&Apache::lonnet::logthis("Calling bubble selector (missing)"); |
|
&scantron_bubble_selector($r,$scan_config,$question, @select_array); |
&scantron_bubble_selector($r,$scan_config,$question, @select_array); |
} |
} |
} else { |
} else { |
Line 6529 sub scantron_bubble_selector {
|
Line 6650 sub scantron_bubble_selector {
|
|
|
my $total_lines = $lines*2; |
my $total_lines = $lines*2; |
my @alphabet=('A'..'Z'); |
my @alphabet=('A'..'Z'); |
&Apache::lonnet::logthis("Putting in question number $quest"); |
|
$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>"); |
$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>"); |
|
|
for (my $l = 0; $l < $lines; $l++) { |
for (my $l = 0; $l < $lines; $l++) { |
Line 6563 sub scantron_bubble_selector {
|
Line 6684 sub scantron_bubble_selector {
|
# multiline questions (different values e.g..). |
# multiline questions (different values e.g..). |
|
|
for (my $i=0;$i<$max;$i++) { |
for (my $i=0;$i<$max;$i++) { |
|
my $value = "$l:$i"; # Relative bubble line #: Bubble in line. |
$r->print("\n". |
$r->print("\n". |
'<td><label><input type="radio" name="scantron_correct_Q_'. |
'<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>'); |
$r->print('</tr>'); |
|
|
Line 6885 sub scantron_validate_missingbubbles {
|
Line 7007 sub scantron_validate_missingbubbles {
|
|
|
foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) { |
foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) { |
if ($missing > $max_bubble) { next; } |
if ($missing > $max_bubble) { next; } |
&Apache::lonnet::logthis("Marking $missing for missing bubble check"); |
|
push(@to_correct,$missing); |
push(@to_correct,$missing); |
} |
} |
if (@to_correct) { |
if (@to_correct) { |
Line 7216 sub show_grading_menu_form {
|
Line 7337 sub show_grading_menu_form {
|
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<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="saveState" value="'.$env{'form.saveState'}.'" />'."\n". |
'<input type="hidden" name="command" value="gradingmenu" />'."\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"; |
'</form>'."\n"; |
return $result; |
return $result; |
} |
} |
Line 7286 sub grading_menu {
|
Line 7407 sub grading_menu {
|
$Str .= '<input type="hidden" name="command" value="" />'. |
$Str .= '<input type="hidden" name="command" value="" />'. |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n". |
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\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="saveState" value="" />'."\n". |
'<input type="hidden" name="gradingMenu" value="1" />'."\n". |
'<input type="hidden" name="gradingMenu" value="1" />'."\n". |
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
Line 7299 sub grading_menu {
|
Line 7420 sub grading_menu {
|
$menudata->{'url'}.'" >'. |
$menudata->{'url'}.'" >'. |
$menudata->{'name'}."</a></h3>\n"; |
$menudata->{'name'}."</a></h3>\n"; |
} else { |
} else { |
$Str .=' <h3><input type="button" value="Verify Receipt" '. |
$Str .=' <h3><input type="button" value="'.&mt('Verify Receipt').'" '. |
$menudata->{'jscript'}. |
$menudata->{'jscript'}. |
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '. |
' /></h3>'; |
' /></h3>'; |
$Str .= (' 'x8). |
$Str .= (' 'x8). |
' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}). |
&mt(' receipt: [_1]', |
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'; |
&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'}. |
$Str .= ' '.(' 'x8).$menudata->{'short_description'}. |
"\n"; |
"\n"; |
} |
} |
$Str .="</dl>\n"; |
|
$Str .="</form>\n"; |
$Str .="</form>\n"; |
$request->print(<<GRADINGMENUJS); |
$request->print(<<GRADINGMENUJS); |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
Line 7397 sub submit_options {
|
Line 7518 sub submit_options {
|
</script> |
</script> |
GRADINGMENUJS |
GRADINGMENUJS |
&commonJSfunctions($request); |
&commonJSfunctions($request); |
my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>'; |
|
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle); |
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle); |
$result.=$table; |
my $result; |
my (undef,$sections) = &getclasslist('all','0'); |
my (undef,$sections) = &getclasslist('all','0'); |
my $savedState = &savedState(); |
my $savedState = &savedState(); |
my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'}); |
my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'}); |
Line 7416 GRADINGMENUJS
|
Line 7536 GRADINGMENUJS
|
'<input type="hidden" name="gradingMenu" value="1" />'."\n". |
'<input type="hidden" name="gradingMenu" value="1" />'."\n". |
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
'<input type="hidden" name="showgrading" value="yes" />'."\n"; |
|
|
$result.='<table border="0"><tr><td bgcolor=#777777>'."\n". |
$result.=' |
'<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n". |
<div class="LC_grade_select_mode"> |
' <b>Select a Grading/Viewing Option</b></td></tr>'."\n". |
<div class="LC_grade_select_mode_current"> |
'<tr bgcolor="#ffffe6" valign="top"><td>'."\n"; |
<h2> |
|
'.&mt('Grade Current Resource').' |
$result.='<table width="100%" border="0">'; |
</h2> |
$result.='<tr bgcolor="#ffffe6" valign="top">'."\n"; |
<div class="LC_grade_select_mode_body"> |
$result.='<td><b>'.&mt('Sections').'</b></td>'; |
<div class="LC_grades_resource_info"> |
$result.='<td><b>'.&mt('Groups').'</b></td>'; |
'.$table.' |
$result.='<td><b>'.&mt('Access Status').'</td>'."\n"; |
</div> |
$result.='<td><b>'.&mt('Submission Status').'</td>'."\n"; |
<div class="LC_grade_select_mode_selector"> |
$result.='</tr>'; |
<div class="LC_grade_select_mode_selector_header"> |
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n". |
'.&mt('Sections').' |
' <select name="section" multiple="multiple" size="3">'."\n"; |
</div> |
|
<div class="LC_grade_select_mode_selector_body"> |
|
<select name="section" multiple="multiple" size="5">'."\n"; |
if (ref($sections)) { |
if (ref($sections)) { |
foreach (sort (@$sections)) { |
foreach my $section (sort (@$sections)) { |
$result.='<option value="'.$_.'" '. |
$result.='<option value="'.$section.'" '. |
($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n"; |
($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n"; |
} |
} |
} |
} |
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> '; |
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> '; |
$result.= '</td><td>'."\n"; |
$result.=' |
$result.= &Apache::lonstatistics::GroupSelect('group','multiple',3); |
</div> |
$result.='</td><td>'."\n"; |
</div> |
$result.=&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,3,undef,'mult'); |
<div class="LC_grade_select_mode_selector"> |
|
<div class="LC_grade_select_mode_selector_header"> |
$result.='</td>'; |
'.&mt('Groups').' |
$result.='<td><select name="submitonly" size="3">'. |
</div> |
'<option value="yes" '. |
<div class="LC_grade_select_mode_selector_body"> |
($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>'. |
'.&Apache::lonstatistics::GroupSelect('group','multiple',5).' |
'<option value="queued" '. |
</div> |
($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>'. |
</div> |
'<option value="graded" '. |
<div class="LC_grade_select_mode_selector"> |
($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>'. |
<div class="LC_grade_select_mode_selector_header"> |
'<option value="incorrect" '. |
'.&mt('Access Status').' |
($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>'. |
</div> |
'<option value="all" '. |
<div class="LC_grade_select_mode_selector_body"> |
($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>'; |
'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').' |
|
</div> |
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3"><label>'. |
</div> |
'<input type="radio" name="radioChoice" value="submission" '. |
<div class="LC_grade_select_mode_selector"> |
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students'). |
<div class="LC_grade_select_mode_selector_header"> |
'</label> </td></tr>'."\n"; |
'.&mt('Submission Status').' |
|
</div> |
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3">'. |
<div class="LC_grade_select_mode_selector_body"> |
'<label><input type="radio" name="radioChoice" value="viewgrades" '. |
<select name="submitonly" size="5"> |
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '. |
<option value="yes" '. ($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option> |
'<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n"; |
<option value="queued" '. ($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option> |
|
<option value="graded" '. ($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option> |
$result.='<tr bgcolor="#ffffe6"><td colspan="3"><br />'. |
<option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option> |
'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'. |
<option value="all" '. ($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option> |
'</td></tr>'."\n"; |
</select> |
|
</div> |
|
</div> |
$result.='<tr bgcolor="#ffffe6" valign="top"><td colspan="3">'. |
<div class="LC_grade_select_mode_type_body"> |
'<br /><label><input type="radio" name="radioChoice" value="pickStudentPage" '. |
<div class="LC_grade_select_mode_type"> |
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '. |
<label> |
'The <b>complete</b> set/page/sequence/folder: For one student</label></td></tr>'."\n"; |
<input type="radio" name="radioChoice" value="submission" '. |
|
($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '. |
$result.='<tr bgcolor="#ffffe6"><td colspan="3"><br />'. |
&mt('Select individual students to grade and view submissions.').' |
'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'. |
</label> |
'</td></tr></table>'."\n"; |
</div> |
|
<div class="LC_grade_select_mode_type"> |
$result.='</td>'; #<td valign="top">'; |
<label> |
|
<input type="radio" name="radioChoice" value="viewgrades" '. |
# $result.='<table width="100%" border="0">'; |
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '. |
# $result.='<tr bgcolor="#ffffe6"><td>'. |
&mt('Grade all selected students in a grading table.').' |
# '<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'. |
</label> |
# ' '.&mt('scores from file').' </td></tr>'."\n"; |
</div> |
# |
<div class="LC_grade_select_mode_type"> |
# $result.='<tr bgcolor="#ffffe6"><td>'. |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" /> |
# '<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'. |
</div> |
# ' '.&mt('clicker file').' </td></tr>'."\n"; |
</div> |
# |
</div> |
# $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'. |
</div> |
# '<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'. |
<div class="LC_grade_select_mode_page"> |
# '" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n"; |
<h2> |
# |
'.&mt('Grade Complete Folder for One Student').' |
# if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) { |
</h2> |
# $result.='<tr bgcolor="#ffffe6"valign="top"><td>'. |
<div class="LC_grades_select_mode_body"> |
# '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'. |
<div class="LC_grade_select_mode_type_body"> |
# ' '.&mt('receipt').': '. |
<div class="LC_grade_select_mode_type"> |
# &Apache::lonnet::recprefix($env{'request.course.id'}). |
<label> |
# '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'. |
<input type="radio" name="radioChoice" value="pickStudentPage" '. |
# '</td></tr>'."\n"; |
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '. |
# } |
&mt('The <b>complete</b> page/sequence/folder: For one student').' |
# $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'. |
</label> |
# '<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'. |
</div> |
# '" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n"; |
<div class="LC_grade_select_mode_type"> |
# $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'. |
<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next->').'" /> |
# '<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'. |
</div> |
# '" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n"; |
</div> |
# |
</div> |
# $result.='</table>'."\n".'</td>'; |
</div> |
$result.= '</tr></table>'."\n". |
</div> |
'</td></tr></table></form>'."\n"; |
</form>'; |
return $result; |
return $result; |
} |
} |
|
|