version 1.573, 2009/05/11 13:07:19
|
version 1.579, 2009/08/19 19:25:21
|
Line 183 sub get_display_part {
|
Line 183 sub get_display_part {
|
my ($partID,$symb)=@_; |
my ($partID,$symb)=@_; |
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb); |
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb); |
if (defined($display) and $display ne '') { |
if (defined($display) and $display ne '') { |
$display.= " (<span class=\"LC_internal_info\">id $partID</span>)"; |
$display.= ' (<span class="LC_internal_info">' |
|
.&mt('Part ID: [_1]',$partID).'</span>)'; |
} else { |
} else { |
$display=$partID; |
$display=$partID; |
} |
} |
Line 217 sub showResourceInfo {
|
Line 218 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>'.&mt('Part').': </b>'.$display_part. |
$result.='<td><b>'.&mt('Part: [_1]',$display_part).'</b>'. |
' <span class="LC_internal_info">'.$resID.'</span></td>'. |
' <span class="LC_internal_info">'.$resID.'</span></td>'. |
'<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>'; |
'<td><b>'.&mt('Type: [_1]',$responsetype).'</b></td></tr>'; |
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>'; |
# '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>'; |
} |
} |
} |
} |
Line 1734 sub gradeBox {
|
Line 1735 sub gradeBox {
|
|
|
#&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); |
#&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 .= |
$result .= |
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'. |
'<td><b>'.&mt('Part:').'</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points:').'</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'. |
|
|
$result.='</tr></table>'."\n"; |
$result.='</tr></table>'."\n"; |
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n". |
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n". |
Line 2113 KEYWORDS
|
Line 2114 KEYWORDS
|
} |
} |
my $responsetype = $responseType->{$partid}->{$respid}; |
my $responsetype = $responseType->{$partid}->{$respid}; |
if (!exists($record{"resource.$partid.$respid.submission"})) { |
if (!exists($record{"resource.$partid.$respid.submission"})) { |
$lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '. |
$lastsubonly.="\n".'<div class="LC_grade_submission_part">'. |
$display_part.' <span class="LC_internal_info">( ID '.$respid. |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
' )</span> '. |
' <span class="LC_internal_info">'. |
|
'('.&mt('Part ID: [_1]',$respid).')</b>'. |
|
'</span> '. |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>'; |
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>'; |
next; |
next; |
} |
} |
Line 2135 KEYWORDS
|
Line 2138 KEYWORDS
|
{'one_time' => 1}); |
{'one_time' => 1}); |
|
|
$similar="<hr /><h3><span class=\"LC_warning\">". |
$similar="<hr /><h3><span class=\"LC_warning\">". |
&mt('Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])', |
&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])', |
$osim, |
$osim, |
&Apache::loncommon::plainname($oname,$odom), |
&Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')', |
$oname,$odom, |
|
$old_course_desc{'description'}, |
$old_course_desc{'description'}, |
$old_course_desc{'num'}, |
$old_course_desc{'num'}, |
$old_course_desc{'domain'}). |
$old_course_desc{'domain'}). |
Line 2152 KEYWORDS
|
Line 2154 KEYWORDS
|
($env{'form.lastSub'} eq 'hdgrade' && |
($env{'form.lastSub'} eq 'hdgrade' && |
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) { |
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) { |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
$lastsubonly.='<div class="LC_grade_submission_part"><b>Part:</b> '. |
$lastsubonly.='<div class="LC_grade_submission_part">'. |
$display_part.' <span class="LC_internal_info">( ID '.$respid. |
'<b>'.&mt('Part: [_1]',$display_part).'</b>'. |
' )</span> '; |
' <span class="LC_internal_info">'. |
|
'('.&mt('Part ID: [_1]',$respid).')'. |
|
'</b></span> '; |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); |
if (@$files) { |
if (@$files) { |
$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />'; |
$lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />'; |
Line 2297 KEYWORDS
|
Line 2301 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.=&mt('[quant,_1,student]',$ntstu); |
$endform.=&mt('[_1]student(s)',$ntstu); |
$endform.=' <input type="button" value="'.&mt('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="'.&mt('Next').'" '. |
'<input type="button" value="'.&mt('Next').'" '. |
Line 2463 sub processHandGrade {
|
Line 2467 sub processHandGrade {
|
undef,$feedurl,undef, |
undef,$feedurl,undef, |
undef,undef,$showsymb, |
undef,undef,$showsymb, |
$restitle); |
$restitle); |
$request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '. |
$request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '. |
$msgstatus); |
$msgstatus); |
} |
} |
if ($env{'form.collaborator'.$ctr}) { |
if ($env{'form.collaborator'.$ctr}) { |
Line 3295 sub viewgrades {
|
Line 3299 sub viewgrades {
|
|
|
$result.= |
$result.= |
&Apache::loncommon::start_data_table_row()."\n". |
&Apache::loncommon::start_data_table_row()."\n". |
'<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'. |
'<td><b>'.&mt('Part:').'</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points:').'</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'. |
&Apache::loncommon::end_data_table_row()."\n"; |
&Apache::loncommon::end_data_table_row()."\n"; |
$ctsparts++; |
$ctsparts++; |
} |
} |
Line 4467 sub displaySubByDates {
|
Line 4471 sub displaySubByDates {
|
|
|
my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/) |
my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/) |
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); |
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); |
$displaySub[0].='<b>'.&mt('Part:').'</b> '.$display_part.' '; |
$displaySub[0].='<span class="LC_nobreak"'; |
$displaySub[0].='<span class="LC_internal_info">('.&mt('ID').' '. |
$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>' |
$responseId.')</span> <b>'; |
.' <span class="LC_internal_info">' |
|
.'('.&mt('Part ID: [_1]',$responseId).')' |
|
.'</span>' |
|
.' <b>'; |
if ($$record{"$where.$partid.tries"} eq '') { |
if ($$record{"$where.$partid.tries"} eq '') { |
$displaySub[0].=&mt('Trial not counted'); |
$displaySub[0].=&mt('Trial not counted'); |
} else { |
} else { |
$displaySub[0].=&mt('Trial [_1]', |
$displaySub[0].=&mt('Trial: [_1]', |
$$record{"$where.$partid.tries"}); |
$$record{"$where.$partid.tries"}); |
} |
} |
my $responseType=($isTask ? 'Task' |
my $responseType=($isTask ? 'Task' |
Line 4484 sub displaySubByDates {
|
Line 4491 sub displaySubByDates {
|
&get_order($partid,$responseId,$symb,$uname,$udom, |
&get_order($partid,$responseId,$symb,$uname,$udom, |
$no_increment); |
$no_increment); |
} |
} |
$displaySub[0].='</b> '. |
$displaySub[0].='</b></span>'; # /nobreak |
|
$displaySub[0].=' '. |
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />'; |
&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />'; |
} |
} |
} |
} |
Line 5200 sub scantron_selectphase {
|
Line 5208 sub scantron_selectphase {
|
&Apache::loncommon::start_data_table_row()."\n". |
&Apache::loncommon::start_data_table_row()."\n". |
'<td colspan="2">'."\n". |
'<td colspan="2">'."\n". |
'<input type="hidden" name="command" value="checksubmissions" />'."\n". |
'<input type="hidden" name="command" value="checksubmissions" />'."\n". |
'<input type="submit" value="'.&mt('Review Scantron Data and Submission Records').'" />'."\n". |
'<input type="submit" value="'.&mt('Review Bubblesheet Data and Submission Records').'" />'."\n". |
'</td>'."\n". |
'</td>'."\n". |
&Apache::loncommon::end_data_table_row()."\n". |
&Apache::loncommon::end_data_table_row()."\n". |
&Apache::loncommon::end_data_table()."\n". |
&Apache::loncommon::end_data_table()."\n". |
Line 7475 SCANTRONFORM
|
Line 7483 SCANTRONFORM
|
|
|
my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam')); |
my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam')); |
my $count=&get_todo_count($scanlines,$scan_data); |
my $count=&get_todo_count($scanlines,$scan_data); |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status', |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status', |
'Scantron Progress',$count, |
'Bubblesheet Progress',$count, |
'inline',undef,'scantronupload'); |
'inline',undef,'scantronupload'); |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
'Processing first student'); |
'Processing first student'); |
Line 7710 sub scantron_upload_scantron_data {
|
Line 7718 sub scantron_upload_scantron_data {
|
my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'. |
my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'. |
(' 'x2).&mt('(shows course personnel)'); |
(' 'x2).&mt('(shows course personnel)'); |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
my $default_form_data=&defaultFormData(&get_symb($r,1)); |
|
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.'); |
|
my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded."); |
$r->print(' |
$r->print(' |
<script type="text/javascript" language="javascript"> |
<script type="text/javascript" language="javascript"> |
function checkUpload(formname) { |
function checkUpload(formname) { |
if (formname.upfile.value == "") { |
if (formname.upfile.value == "") { |
alert("'.&mt('Please use the browse button to select a file from your local directory.').'"); |
alert("'.$nofile_alert.'"); |
return false; |
return false; |
} |
} |
if (formname.courseid.value == "") { |
if (formname.courseid.value == "") { |
alert("'.&mt('Please use the \"Select Course\" link to open a separate window where you can search for a course to which a file can be uploaded.').'"); |
alert("'.$nocourseid_alert.'"); |
return false; |
return false; |
} |
} |
formname.submit(); |
formname.submit(); |
Line 7760 sub scantron_upload_scantron_data {
|
Line 7770 sub scantron_upload_scantron_data {
|
&Apache::lonhtmlcommon::end_pick_box().'<br /> |
&Apache::lonhtmlcommon::end_pick_box().'<br /> |
|
|
<input name="command" value="scantronupload_save" type="hidden" /> |
<input name="command" value="scantronupload_save" type="hidden" /> |
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" /> |
<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" /> |
</form> |
</form> |
'); |
'); |
return ''; |
return ''; |
Line 7778 sub scantron_upload_scantron_data_save {
|
Line 7788 sub scantron_upload_scantron_data_save {
|
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) && |
if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) && |
!&Apache::lonnet::allowed('usc', |
!&Apache::lonnet::allowed('usc', |
$env{'form.domainid'}.'_'.$env{'form.courseid'})) { |
$env{'form.domainid'}.'_'.$env{'form.courseid'})) { |
$r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />"); |
$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />"); |
if ($symb) { |
if ($symb) { |
$r->print(&show_grading_menu_form($symb)); |
$r->print(&show_grading_menu_form($symb)); |
} else { |
} else { |
Line 9044 ENDHEADER
|
Line 9054 ENDHEADER
|
my $sum=0; |
my $sum=0; |
my $realnumber=$number; |
my $realnumber=$number; |
for (my $i=0;$i<$number;$i++) { |
for (my $i=0;$i<$number;$i++) { |
if ($answer[$i]) { |
if ($correct[$i] eq '-') { |
|
$realnumber--; |
|
} elsif ($answer[$i]) { |
if ($gradingmechanism eq 'attendance') { |
if ($gradingmechanism eq 'attendance') { |
$sum+=$pcorrect; |
$sum+=$pcorrect; |
} elsif ($answer[$i] eq '*') { |
} elsif ($correct[$i] eq '*') { |
$sum+=$pcorrect; |
$sum+=$pcorrect; |
} elsif ($answer[$i] eq '-') { |
|
$realnumber--; |
|
} else { |
} else { |
if ($answer[$i] eq $correct[$i]) { |
if ($answer[$i] eq $correct[$i]) { |
$sum+=$pcorrect; |
$sum+=$pcorrect; |