--- loncom/homework/grades.pm 2003/07/14 14:43:39 1.114
+++ loncom/homework/grades.pm 2003/09/29 21:31:30 1.130.2.1.2.6
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.114 2003/07/14 14:43:39 bowersj2 Exp $
+# $Id: grades.pm,v 1.130.2.1.2.6 2003/09/29 21:31:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,6 +33,7 @@
# June-August H.K. Ng
# Year 2003
# February, March H.K. Ng
+# July, H. K. Ng
#
package Apache::grades;
@@ -95,10 +96,23 @@ sub get_fullname {
return $fullname;
}
+#--- Format fullname, username:domain if different for display
+#--- Use anywhere where the student names are listed
+sub nameUserString {
+ my ($type,$fullname,$uname,$udom) = @_;
+ if ($type eq 'header') {
+ return '<b> Fullname </b><font color="#999999">(Username)</font> ';
+ } else {
+ return ' '.$fullname.'<font color="#999999"> ('.$uname.
+ ($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
+ }
+}
+
#--- Get the partlist and the response type for a given problem. ---
#--- Indicate if a response type is coded handgraded or not. ---
sub response_type {
- my ($url) = shift;
+ my ($url,$symb) = shift;
+ $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
my $allkeys = &Apache::lonnet::metadata($url,'keys');
my %seen = ();
my (@partlist,%handgrade);
@@ -106,7 +120,9 @@ sub response_type {
if (/^\w+response_\w+.*/) {
my ($responsetype,$part) = split(/_/,$_,2);
my ($partid,$respid) = split(/_/,$part);
- $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
+ $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
+ my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
+ $handgrade{$part} = $responsetype.':'.($value eq 'yes' ? 'yes' : 'no');
next if ($seen{$partid} > 0);
$seen{$partid}++;
push @partlist,$partid;
@@ -115,10 +131,105 @@ sub response_type {
return \@partlist,\%handgrade;
}
+#--- Show resource title
+#--- and parts and response type
+sub showResourceInfo {
+ my ($url,$probTitle) = @_;
+ my $result ='<table border="0">'.
+ '<tr><td colspan=3><font size=+1><b>Current Resource: </b>'.$probTitle.'</font></td></tr>'."\n";
+ my ($partlist,$handgrade) = &response_type($url);
+ my %resptype = ();
+ my $hdgrade='no';
+ for (sort keys(%$handgrade)) {
+ my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
+ my $partID = (split(/_/))[0];
+ $resptype{$partID} = $responsetype;
+ $hdgrade = $handgrade if ($handgrade eq 'yes');
+ $result.='<tr><td><b>Part </b>'.$partID.'</td>'.
+ '<td><b>Type: </b>'.$responsetype.'</td></tr>';
+# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
+ }
+ $result.='</table>'."\n";
+ return $result,\%resptype,$hdgrade,$partlist,$handgrade;
+}
+
+#--- Clean response type for display
+#--- Currently filters option response type only.
+sub cleanRecord {
+ my ($answer,$response,$symb) = @_;
+ if ($response eq 'option') {
+ my (@IDs,@ans);
+ foreach (split(/\&/,&Apache::lonnet::unescape($answer))) {
+ my ($optionID,$ans) = split(/=/);
+ push @IDs,$optionID.'</font>';
+ push @ans,$ans;
+ }
+ my $grayFont = '<font color="#999999">';
+ return '<blockquote><table border="1">'.
+ '<tr valign="top"><td>Answer</td><td>'.
+ (join '</td><td>',@ans).'</td></tr>'.
+ '<tr valign="top"><td>'.$grayFont.'Option ID</font></td><td>'.$grayFont.
+ (join '</td><td>'.$grayFont,@IDs).'</font></td></tr>'.
+ '</table></blockquote>';
+ }
+ if ($response eq 'essay') {
+ if (! exists ($ENV{'form.'.$symb})) {
+ my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+ my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
+ $ENV{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
+ $ENV{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
+ $ENV{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
+ $ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
+ }
+ return '<br /><br /><blockquote>'.&keywords_highlight($answer).'</blockquote>';
+ }
+ return $answer;
+}
+
+#-- A couple of common js functions
+sub commonJSfunctions {
+ my $request = shift;
+ $request->print(<<COMMONJSFUNCTIONS);
+<script type="text/javascript" language="javascript">
+ function radioSelection(radioButton) {
+ var selection=null;
+ if (radioButton.length > 1) {
+ for (var i=0; i<radioButton.length; i++) {
+ if (radioButton[i].checked) {
+ return radioButton[i].value;
+ }
+ }
+ } else {
+ if (radioButton.checked) return radioButton.value;
+ }
+ return selection;
+ }
+
+ function pullDownSelection(selectOne) {
+ var selection="";
+ if (selectOne.length > 1) {
+ for (var i=0; i<selectOne.length; i++) {
+ if (selectOne[i].selected) {
+ return selectOne[i].value;
+ }
+ }
+ } else {
+ if (selectOne.selected) return selectOne.value;
+ }
+ }
+</script>
+COMMONJSFUNCTIONS
+}
+
#--- Dumps the class list with usernames,list of sections,
#--- section, ids and fullnames for each user.
sub getclasslist {
my ($getsec,$filterlist) = @_;
+ $getsec = $getsec eq '' ? 'all' : $getsec;
my $classlist=&Apache::loncoursedata::get_classlist();
# Bail out if we were unable to get the classlist
return if (! defined($classlist));
@@ -199,7 +310,7 @@ sub student_gradeStatus {
my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
my %partstatus = ();
foreach (@$partlist) {
- my ($status,$foo) = split(/_/,$record{"resource.$_.solved"},2);
+ my ($status,undef) = split(/_/,$record{"resource.$_.solved"},2);
$status = 'nothing' if ($status eq '');
$partstatus{$_} = $status;
my $subkey = "resource.$_.submitted_by";
@@ -225,6 +336,7 @@ sub jscriptNform {
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
'<input type="hidden" name="command" value="submission" />'."\n".
'<input type="hidden" name="student" value="" />'."\n".
'<input type="hidden" name="userdom" value="" />'."\n".
@@ -297,7 +409,7 @@ sub verifyreceipt {
my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
$receipt.'</h3></font>'."\n".
- '<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font><br><br>'."\n";
+ '<font size=+1><b>Resource: </b>'.$ENV{'form.probTitle'}.'</font><br><br>'."\n";
my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');
@@ -345,26 +457,15 @@ sub listStudents {
my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};
- my $result;
- my ($partlist,$handgrade) = &response_type($url);
- for (sort keys(%$handgrade)) {
- my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
- $ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes');
- $result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
- '<td><b>Type: </b>'.$responsetype.'</td>'.
- '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
- }
- $result.='</table>'."\n";
-
- my $viewgrade = $ENV{'form.handgrade'} eq 'yes' ? 'View/Grade' : 'View';
+ my $viewgrade = $ENV{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
$ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
- $result='<h3><font color="#339933"> '.
- $viewgrade.
- ' Submissions for a Student or a Group of Students</font></h3>'.
- '<table border="0"><tr><td colspan=3><font size=+1>'.
- '<b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>'.$result;
+ my $result='<h3><font color="#339933"> '.$viewgrade.
+ ' Submissions for a Student or a Group of Students</font></h3>';
+
+ my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
+ $result.=$table;
$request->print(<<LISTJAVASCRIPT);
<script type="text/javascript" language="javascript">
@@ -385,7 +486,7 @@ sub listStudents {
sense = "the student";
}
if (ctr == 0) {
- alert("Please select "+sense+" before clicking on the $viewgrade button.");
+ alert("Please select "+sense+" before clicking on the Next button.");
return false;
}
document.gradesub.submit();
@@ -396,34 +497,21 @@ sub listStudents {
formname.command.value = 'submission';
formname.submit();
}
-
- function pullDownSelection(selectOne) {
- var selection="";
- if (selectOne.length > 1) {
- for (var i=0; i<selectOne.length; i++) {
- if (selectOne[i].selected) {
- return selectOne[i].value;
- }
- }
- } else {
- if (selectOne.selected) return selectOne.value;
- }
- }
</script>
LISTJAVASCRIPT
+ &commonJSfunctions($request);
$request->print($result);
- my $checkhdgrade = $ENV{'form.handgrade'} eq 'yes' ? 'checked' : '';
- my $checklastsub = $ENV{'form.handgrade'} eq 'yes' ? '' : 'checked';
-
+ my $checkhdgrade = ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
+ my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'."\n".
- ' <b>View Problem: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
+ ' <b>View Problem Text: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
'<input type="radio" name="vProb" value="yes" /> one student '."\n".
'<input type="radio" name="vProb" value="all" /> all students <br />'."\n".
' <b>Submissions: </b>'."\n";
- if ($ENV{'form.handgrade'} eq 'yes') {
- $gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> handgrade only'."\n";
+ if ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
+ $gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only'."\n";
}
my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};
@@ -431,10 +519,10 @@ LISTJAVASCRIPT
$gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last sub only'."\n".
'<input type="radio" name="lastSub" value="last" /> last sub & parts info'."\n".
+ '<input type="radio" name="lastSub" value="datesub" /> by dates and submissions'."\n".
'<input type="radio" name="lastSub" value="all" /> all details'."\n".
'<input type="hidden" name="section" value="'.$getsec.'" />'."\n".
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".
- '<input type="hidden" name="response" value="'.$ENV{'form.response'}.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$ENV{'form.handgrade'}.'" /><br />'."\n".
'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" /><br />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
@@ -443,30 +531,34 @@ LISTJAVASCRIPT
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
- $gradeTable.='<b>Student Status:</b> '.
- &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
+ if (exists($ENV{'form.gradingMenu'}) && exists($ENV{'form.Status'})) {
+ $gradeTable.='<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n";
+ } else {
+ $gradeTable.='<b>Student Status:</b> '.
+ &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
+ }
- $gradeTable.='To '.lc($viewgrade).' a submission, click on the check box next to the student\'s name. Then '."\n".
- 'click on the '.$viewgrade.' button. To view the submissions for a group of students, click'."\n".
- ' on the check boxes for the group of students.<br />'."\n".
+ $gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
+ 'next to the student\'s name(s). Then click on the Next button.<br />'."\n".
'<input type="hidden" name="command" value="processGroup" />'."\n";
$gradeTable.='<input type="button" '."\n".
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
- 'value="'.$viewgrade.'" />'."\n";
+ 'value="Next->" />'."\n";
my (undef, undef, $fullname) = &getclasslist($getsec,'1');
$gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">';
my $loop = 0;
while ($loop < 2) {
- $gradeTable.='<td><b> Select </b></td><td><b> Fullname </b>'.
- '<font color="#999999">(Username)</font> </td>';
+ $gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'.
+ '<td>'.&nameUserString('header').'</td>';
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (sort(@$partlist)) {
$gradeTable.='<td><b> Part '.(split(/_/))[0].' Status </b></td>';
}
}
$loop++;
+# $gradeTable.='<td></td>' if ($loop%2 ==1);
}
$gradeTable.='</tr>'."\n";
@@ -493,10 +585,10 @@ LISTJAVASCRIPT
$ctr++;
if ( $perm{'vgr'} eq 'F' ) {
$gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
- $gradeTable.='<td align="center"><input type=checkbox name="stuinfo" value="'.
+ $gradeTable.='<td align="right">'.$ctr.' </td>'.
+ '<td align="center"><input type=checkbox name="stuinfo" value="'.
$student.':'.$$fullname{$student}.' "></td>'."\n".
- '<td> '.$$fullname{$student}.' '."\n".
- '<font color="#999999">('.$uname.')</font></td>'."\n";
+ '<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</td>'."\n";
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (sort keys(%status)) {
@@ -504,11 +596,12 @@ LISTJAVASCRIPT
$gradeTable.='<td align="middle"> '.$status{$_}.' </td>'."\n";
}
}
+# $gradeTable.='<td></td>' if ($ctr%2 ==1);
$gradeTable.='</tr>'."\n" if ($ctr%2 ==0);
}
}
if ($ctr%2 ==1) {
- $gradeTable.='<td> </td><td> </td>';
+ $gradeTable.='<td> </td><td> </td><td> </td>';
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (@$partlist) {
$gradeTable.='<td> </td>';
@@ -520,7 +613,7 @@ LISTJAVASCRIPT
$gradeTable.='</table></td></tr></table>'.
'<input type="button" '.
'onClick="javascript:checkSelect(this.form.stuinfo);" '.
- 'value="'.$viewgrade.'" /></form>'."\n";
+ 'value="Next->" /></form>'."\n";
if ($ctr == 0) {
my $num_students=(scalar(keys(%$fullname)));
if ($num_students eq 0) {
@@ -569,9 +662,9 @@ sub sub_page_js {
$request->print(<<SUBJAVASCRIPT);
<script type="text/javascript" language="javascript">
function updateRadio(formname,id,weight) {
- var gradeBox = eval("formname.GD_BOX"+id);
- var radioButton = eval("formname.RADVAL"+id);
- var oldpts = eval("formname.oldpts"+id+".value");
+ var gradeBox = formname["GD_BOX"+id];
+ var radioButton = formname["RADVAL"+id];
+ var oldpts = formname["oldpts"+id].value;
var pts = checkSolved(formname,id) == 'update' ? gradeBox.value : oldpts;
gradeBox.value = pts;
var resetbox = false;
@@ -593,7 +686,7 @@ sub sub_page_js {
var resp = confirm("You entered a value ("+pts+
") greater than the weight for the part. Accept?");
if (resp == false) {
- gradeBox.value = "";
+ gradeBox.value = oldpts;
return;
}
}
@@ -605,18 +698,17 @@ sub sub_page_js {
}
}
updateSelect(formname,id);
- var stores = eval("formname.stores"+id);
- stores.value = "0";
+ formname["stores"+id].value = "0";
}
function writeBox(formname,id,pts) {
- var gradeBox = eval("formname.GD_BOX"+id);
+ var gradeBox = formname["GD_BOX"+id];
if (checkSolved(formname,id) == 'update') {
gradeBox.value = pts;
} else {
- var oldpts = eval("formname.oldpts"+id+".value");
+ var oldpts = formname["oldpts"+id].value;
gradeBox.value = oldpts;
- var radioButton = eval("formname.RADVAL"+id);
+ var radioButton = formname["RADVAL"+id];
for (var i=0; i<radioButton.length; i++) {
radioButton[i].checked=false;
if (i == oldpts) {
@@ -624,8 +716,7 @@ sub sub_page_js {
}
}
}
- var stores = eval("formname.stores"+id);
- stores.value = "0";
+ formname["stores"+id].value = "0";
updateSelect(formname,id);
return;
}
@@ -635,17 +726,17 @@ sub sub_page_js {
updateSelect(formname,id);
return;
}
- gradeSelect = eval("formname.GD_SEL"+id);
+ gradeSelect = formname["GD_SEL"+id];
for (var i=0; i<gradeSelect.length; i++) {
if (gradeSelect[i].selected) {
var selectx=i;
}
}
- var stores = eval("formname.stores"+id);
+ var stores = formname["stores"+id];
if (selectx == stores.value) { return };
- var gradeBox = eval("formname.GD_BOX"+id);
+ var gradeBox = formname["GD_BOX"+id];
gradeBox.value = "";
- var radioButton = eval("formname.RADVAL"+id);
+ var radioButton = formname["RADVAL"+id];
for (var i=0; i<radioButton.length; i++) {
radioButton[i].checked=false;
}
@@ -653,34 +744,35 @@ sub sub_page_js {
}
function checkSolved(formname,id) {
- if (eval("formname.solved"+id+".value") == "correct_by_student") {
- alert("This problem has been graded correct by the computer. The score cannot be changed.");
- return "noupdate";
+ if (formname["solved"+id].value == "correct_by_student" && formname.overRideScore.value == 'no') {
+ var reply = confirm("This problem has been graded correct by the computer. Do you want to change the score?");
+ if (!reply) {return "noupdate";}
+ formname.overRideScore.value = 'yes';
}
return "update";
}
function updateSelect(formname,id) {
- var gradeSelect = eval("formname.GD_SEL"+id);
- gradeSelect[0].selected = true;
+ formname["GD_SEL"+id][0].selected = true;
return;
}
-//=========== Check that a point is assigned for all the parts (essay grading only) ============
+//=========== Check that a point is assigned for all the parts ============
function checksubmit(formname,val,total,parttot) {
- document.SCORE.gradeOpt.value = val;
+ formname.gradeOpt.value = val;
if (val == "Save & Next") {
for (i=0;i<=total;i++) {
for (j=0;j<parttot;j++) {
- var partid = eval("formname.partid"+i+"_"+j+".value");
- var selopt = eval("formname.GD_SEL"+i+"_"+partid);
- if (selopt[0].selected) {
- var points = eval("formname.GD_BOX"+i+"_"+partid+".value");
+ var partid = formname["partid"+i+"_"+j].value;
+ if (formname["GD_SEL"+i+"_"+partid][0].selected) {
+ var points = formname["GD_BOX"+i+"_"+partid].value;
if (points == "") {
- var name = eval("formname.name"+i+".value");
- var resp = confirm("You did not assign a score for "+name+", part "+partid+". Continue?");
+ var name = formname["name"+i].value;
+ var studentID = (name != '' ? name : formname["unamedom"+i].value);
+ var resp = confirm("You did not assign a score for "+studentID+
+ ", part "+partid+". Continue?");
if (resp == false) {
- eval("formname.GD_BOX"+i+"_"+partid+".focus()");
+ formname["GD_BOX"+i+"_"+partid].focus();
return false;
}
}
@@ -690,6 +782,13 @@ sub sub_page_js {
}
}
+ if (val == "Grade Student") {
+ formname.showgrading.value = "yes";
+ if (formname.Status.value == "") {
+ formname.Status.value = "Active";
+ }
+ formname.studentNo.value = total;
+ }
formname.submit();
}
@@ -698,11 +797,10 @@ sub sub_page_js {
noscore = new Array(100);
var ptr = 0;
for (i=1;i<total;i++) {
- var partid = eval("formname.q_"+i+".value");
- var selopt = eval("formname.GD_SEL"+i+"_"+partid);
- if (selopt[0].selected) {
- var points = eval("formname.GD_BOX"+i+"_"+partid+".value");
- var status = eval("formname.solved"+i+"_"+partid+".value");
+ var partid = formname["q_"+i].value;
+ if (formname["GD_SEL"+i+"_"+partid][0].selected) {
+ var points = formname["GD_BOX"+i+"_"+partid].value;
+ var status = formname["solved"+i+"_"+partid].value;
if (points == "" && status != "correct_by_student") {
noscore[ptr] = i;
ptr++;
@@ -738,18 +836,19 @@ SUBJAVASCRIPT
sub sub_page_kw_js {
my $request = shift;
my $iconpath = $request->dir_config('lonIconsURL');
+ &commonJSfunctions($request);
$request->print(<<SUBJAVASCRIPT);
<script type="text/javascript" language="javascript">
//===================== Show list of keywords ====================
- function keywords(keyform) {
- var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keyform.value);
+ function keywords(formname) {
+ var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",formname.keywords.value);
if (nret==null) return;
- keyform.value = nret;
+ formname.keywords.value = nret;
- document.SCORE.refresh.value = "on";
- if (document.SCORE.keywords.value != "") {
- document.SCORE.submit();
+ if (formname.keywords.value != "") {
+ formname.refresh.value = "on";
+ formname.submit();
}
return;
}
@@ -775,10 +874,9 @@ sub sub_page_kw_js {
}
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
if (nret==null) return;
- var curlist = document.SCORE.keywords.value;
- document.SCORE.keywords.value = curlist+" "+nret;
- document.SCORE.refresh.value = "on";
+ document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
if (document.SCORE.keywords.value != "") {
+ document.SCORE.refresh.value = "on";
document.SCORE.submit();
}
return;
@@ -795,21 +893,23 @@ sub sub_page_kw_js {
var Nmsg = msgform.savemsgN.value;
savedMsgHeader(Nmsg,usrctr,fullname);
var subject = msgform.msgsub.value;
- var rtrchk = eval("document.SCORE.includemsg"+usrctr);
- var msgchk = rtrchk.value;
+ var msgchk = document.SCORE["includemsg"+usrctr].value;
re = /msgsub/;
var shwsel = "";
if (re.test(msgchk)) { shwsel = "checked" }
- displaySubject(subject,shwsel);
+ subject = (document.SCORE.shownSub.value == 0 ? checkEntities(subject) : subject);
+ displaySubject(checkEntities(subject),shwsel);
for (var i=1; i<=Nmsg; i++) {
- var testpt = "savemsg"+i+",";
- re = /testpt/;
+ var testmsg = "savemsg"+i+",";
+ re = new RegExp(testmsg,"g");
shwsel = "";
if (re.test(msgchk)) { shwsel = "checked" }
- var message = eval("document.SCORE.savemsg"+i+".value");
- displaySavedMsg(i,message,shwsel);
+ var message = document.SCORE["savemsg"+i].value;
+ message = (document.SCORE["shownOnce"+i].value == 0 ? checkEntities(message) : message);
+ displaySavedMsg(i,message,shwsel); //I do not get it. w/o checkEntities on saved messages,
+ //any < is already converted to <, etc. However, only once!!
}
- newmsg = eval("document.SCORE.newmsg"+usrctr+".value");
+ newmsg = document.SCORE["newmsg"+usrctr].value;
shwsel = "";
re = /newmsg/;
if (re.test(msgchk)) { shwsel = "checked" }
@@ -818,7 +918,22 @@ sub sub_page_kw_js {
return;
}
-// var pWin = null;
+ function checkEntities(strx) {
+ if (strx.length == 0) return strx;
+ var orgStr = ["&", "<", ">", '"'];
+ var newStr = ["&", "<", ">", """];
+ var counter = 0;
+ while (counter < 4) {
+ strx = strReplace(strx,orgStr[counter],newStr[counter]);
+ counter++;
+ }
+ return strx;
+ }
+
+ function strReplace(strx, orgStr, newStr) {
+ return strx.split(orgStr).join(newStr);
+ }
+
function savedMsgHeader(Nmsg,usrctr,fullname) {
var height = 70*Nmsg+250;
var scrollbar = "no";
@@ -826,20 +941,25 @@ sub sub_page_kw_js {
height = 600;
scrollbar = "yes";
}
-// if (window.pWin) {window.pWin.close(); window.pWin=null}
- pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx=70,screeny=75,width=600,height='+height);
+ var xpos = (screen.width-600)/2;
+ xpos = (xpos < 0) ? '0' : xpos;
+ var ypos = (screen.height-height)/2-30;
+ ypos = (ypos < 0) ? '0' : ypos;
+
+ pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
pWin.focus();
pDoc = pWin.document;
+ pDoc.open('text/html','replace');
pDoc.write("<html><head>");
pDoc.write("<title>Message Central</title>");
pDoc.write("<script language=javascript>");
pDoc.write("function checkInput() {");
- pDoc.write(" opener.document.SCORE.msgsub.value = document.msgcenter.msgsub.value;");
+ pDoc.write(" opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);");
pDoc.write(" var nmsg = opener.document.SCORE.savemsgN.value;");
pDoc.write(" var usrctr = document.msgcenter.usrctr.value;");
- pDoc.write(" var newval = eval(\\"opener.document.SCORE.newmsg\\"+usrctr);");
- pDoc.write(" newval.value = document.msgcenter.newmsg.value;");
+ pDoc.write(" var newval = opener.document.SCORE[\\"newmsg\\"+usrctr];");
+ pDoc.write(" newval.value = opener.checkEntities(document.msgcenter.newmsg.value);");
pDoc.write(" var msgchk = \\"\\";");
pDoc.write(" if (document.msgcenter.subchk.checked) {");
@@ -847,10 +967,12 @@ sub sub_page_kw_js {
pDoc.write(" }");
pDoc.write(" var includemsg = 0;");
pDoc.write(" for (var i=1; i<=nmsg; i++) {");
- pDoc.write(" var opnmsg = eval(\\"opener.document.SCORE.savemsg\\"+i);");
- pDoc.write(" var frmmsg = eval(\\"document.msgcenter.msg\\"+i);");
- pDoc.write(" opnmsg.value = frmmsg.value;");
- pDoc.write(" var chkbox = eval(\\"document.msgcenter.msgn\\"+i);");
+ pDoc.write(" var opnmsg = opener.document.SCORE[\\"savemsg\\"+i];");
+ pDoc.write(" var frmmsg = document.msgcenter[\\"msg\\"+i];");
+ pDoc.write(" opnmsg.value = opener.checkEntities(frmmsg.value);");
+ pDoc.write(" var showflg = opener.document.SCORE[\\"shownOnce\\"+i];");
+ pDoc.write(" showflg.value = \\"1\\";");
+ pDoc.write(" var chkbox = document.msgcenter[\\"msgn\\"+i];");
pDoc.write(" if (chkbox.checked) {");
pDoc.write(" msgchk += \\"savemsg\\"+i+\\",\\";");
pDoc.write(" includemsg = 1;");
@@ -860,9 +982,9 @@ sub sub_page_kw_js {
pDoc.write(" msgchk += \\"newmsg\\"+usrctr;");
pDoc.write(" includemsg = 1;");
pDoc.write(" }");
- pDoc.write(" imgformname = eval(\\"opener.document.SCORE.mailicon\\"+usrctr);");
+ pDoc.write(" imgformname = opener.document.SCORE[\\"mailicon\\"+usrctr];");
pDoc.write(" imgformname.src = \\"$iconpath/\\"+((includemsg) ? \\"mailto.gif\\" : \\"mailbkgrd.gif\\");");
- pDoc.write(" var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
+ pDoc.write(" var includemsg = opener.document.SCORE[\\"includemsg\\"+usrctr];");
pDoc.write(" includemsg.value = msgchk;");
pDoc.write(" self.close()");
@@ -914,6 +1036,7 @@ sub sub_page_kw_js {
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
pDoc.write("</form>");
pDoc.write("</body></html>");
+ pDoc.close();
}
//====================== Script for keyword highlight options ==============
@@ -947,20 +1070,25 @@ sub sub_page_kw_js {
return;
}
-// var hwdWin = null;
function highlightCentral() {
// if (window.hwdWin) window.hwdWin.close();
- hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx=100,screeny=75');
+ var xpos = (screen.width-400)/2;
+ xpos = (xpos < 0) ? '0' : xpos;
+ var ypos = (screen.height-330)/2-30;
+ ypos = (ypos < 0) ? '0' : ypos;
+
+ hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
hwdWin.focus();
var hDoc = hwdWin.document;
+ hDoc.open('text/html','replace');
hDoc.write("<html><head>");
hDoc.write("<title>Highlight Central</title>");
hDoc.write("<script language=javascript>");
hDoc.write("function updateChoice(flag) {");
- hDoc.write(" opener.document.SCORE.kwclr.value = radioSelection(document.hlCenter.kwdclr);");
- hDoc.write(" opener.document.SCORE.kwsize.value = radioSelection(document.hlCenter.kwdsize);");
- hDoc.write(" opener.document.SCORE.kwstyle.value = radioSelection(document.hlCenter.kwdstyle);");
+ hDoc.write(" opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);");
+ hDoc.write(" opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);");
+ hDoc.write(" opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);");
hDoc.write(" opener.document.SCORE.refresh.value = \\"on\\";");
hDoc.write(" if (opener.document.SCORE.keywords.value!=\\"\\"){");
hDoc.write(" opener.document.SCORE.submit();");
@@ -968,16 +1096,6 @@ sub sub_page_kw_js {
hDoc.write(" self.close()");
hDoc.write("}");
- hDoc.write("function radioSelection(radioButton) {");
- hDoc.write(" var selection=null;");
- hDoc.write(" for (var i=0; i<radioButton.length; i++) {");
- hDoc.write(" if (radioButton[i].checked) {");
- hDoc.write(" selection=radioButton[i].value;");
- hDoc.write(" return selection;");
- hDoc.write(" }");
- hDoc.write(" }");
- hDoc.write("}");
-
hDoc.write("<");
hDoc.write("/script>");
@@ -1011,6 +1129,7 @@ sub sub_page_kw_js {
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
hDoc.write("</form>");
hDoc.write("</body></html>");
+ hDoc.close();
}
</script>
@@ -1060,11 +1179,12 @@ sub gradeBox {
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
$result.='<option> </option>'.
- '<option selected="on">excused</option></select>'."\n";
+ '<option selected="on">excused</option>';
} else {
$result.='<option selected="on"> </option>'.
- '<option>excused</option></select>'."\n";
+ '<option>excused</option>';
}
+ $result.='<option>reset status</option></select>'."\n";
$result.="  \n";
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
@@ -1107,6 +1227,7 @@ sub submission {
(my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
my ($uname,$udom) = ($ENV{'form.student'},$ENV{'form.userdom'});
+ $udom = ($udom eq '' ? $ENV{'user.domain'} : $udom); #has form.userdom changed for a student?
my $usec = &Apache::lonnet::getsection($udom,$uname,$ENV{'request.course.id'});
$ENV{'form.fullname'} = &get_fullname ($uname,$udom) if $ENV{'form.fullname'} eq '';
@@ -1114,22 +1235,32 @@ sub submission {
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
if (!&canview($usec)) {
- $request->print('<font color="red">Unable to view requested student.('.$uname.$udom.$usec.$ENV{'request.course.id'}.')</font>');
+ $request->print('<font color="red">Unable to view requested student.('.
+ $uname.$udom.$usec.$ENV{'request.course.id'}.')</font>');
$request->print(&show_grading_menu_form($symb,$url));
return;
}
+ $ENV{'form.lastSub'} = ($ENV{'form.lastSub'} eq '' ? 'datesub' : $ENV{'form.lastSub'});
my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+ my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+ '/check.gif" height="16" border="0" />';
# header info
if ($counter == 0) {
&sub_page_js($request);
- &sub_page_kw_js($request);
+ &sub_page_kw_js($request) if ($ENV{'form.handgrade'} eq 'yes');
$ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
$request->print('<h3> <font color="#339933">Submission Record</font></h3>'."\n".
- '<font size=+1> <b>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
+ '<font size=+1> <b>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
+
+ if ($ENV{'form.handgrade'} eq 'no') {
+ my $checkMark='<br /><br /> <b>Note:</b> Part(s) graded correct by the computer is marked with a '.
+ $checkIcon.' symbol.'."\n";
+ $request->print($checkMark);
+ }
# option to display problem, only once else it cause problems
# with the form later since the problem has a form.
@@ -1140,7 +1271,7 @@ sub submission {
# kwclr is the only variable that is guaranteed to be non blank
# if this subroutine has been called once.
my %keyhash = ();
- if ($ENV{'form.kwclr'} eq '') {
+ if ($ENV{'form.kwclr'} eq '' && $ENV{'form.handgrade'} eq 'yes') {
%keyhash = &Apache::lonnet::dump('nohist_handgrade',
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
@@ -1153,14 +1284,18 @@ sub submission {
$ENV{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?
$keyhash{$symb.'_subject'} : $ENV{'form.probTitle'};
$ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
-
}
+ my $overRideScore = $ENV{'form.overRideScore'} eq '' ? 'no' : $ENV{'form.overRideScore'};
$request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
'<input type="hidden" name="command" value="handgrade" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
+ '<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="refresh" value="off" />'."\n".
+ '<input type="hidden" name="studentNo" value="" />'."\n".
+ '<input type="hidden" name="gradeOpt" value="" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" />'."\n".
@@ -1168,24 +1303,27 @@ sub submission {
'<input type="hidden" name="lastSub" value="'.$ENV{'form.lastSub'}.'" />'."\n".
'<input type="hidden" name="section" value="'.$ENV{'form.section'}.'">'."\n".
'<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
- '<input type="hidden" name="response" value="'.$ENV{'form.response'}.'">'."\n".
'<input type="hidden" name="handgrade" value="'.$ENV{'form.handgrade'}.'">'."\n".
- '<input type="hidden" name="keywords" value="'.$ENV{'form.keywords'}.'" />'."\n".
- '<input type="hidden" name="kwclr" value="'.$ENV{'form.kwclr'}.'" />'."\n".
- '<input type="hidden" name="kwsize" value="'.$ENV{'form.kwsize'}.'" />'."\n".
- '<input type="hidden" name="kwstyle" value="'.$ENV{'form.kwstyle'}.'" />'."\n".
- '<input type="hidden" name="msgsub" value="'.$ENV{'form.msgsub'}.'" />'."\n".
- '<input type="hidden" name="savemsgN" value="'.$ENV{'form.savemsgN'}.'" />'."\n".
'<input type="hidden" name="NCT"'.
' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
+ if ($ENV{'form.handgrade'} eq 'yes') {
+ $request->print('<input type="hidden" name="keywords" value="'.$ENV{'form.keywords'}.'" />'."\n".
+ '<input type="hidden" name="kwclr" value="'.$ENV{'form.kwclr'}.'" />'."\n".
+ '<input type="hidden" name="kwsize" value="'.$ENV{'form.kwsize'}.'" />'."\n".
+ '<input type="hidden" name="kwstyle" value="'.$ENV{'form.kwstyle'}.'" />'."\n".
+ '<input type="hidden" name="msgsub" value="'.$ENV{'form.msgsub'}.'" />'."\n".
+ '<input type="hidden" name="shownSub" value="0" />'."\n".
+ '<input type="hidden" name="savemsgN" value="'.$ENV{'form.savemsgN'}.'" />'."\n");
+ }
my ($cts,$prnmsg) = (1,'');
while ($cts <= $ENV{'form.savemsgN'}) {
$prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
- ($keyhash{$symb.'_savemsg'.$cts} eq '' ?
+ (!exists($keyhash{$symb.'_savemsg'.$cts}) ?
&Apache::lonfeedback::clear_out_html($ENV{'form.savemsg'.$cts}) :
&Apache::lonfeedback::clear_out_html($keyhash{$symb.'_savemsg'.$cts})).
- '" />'."\n";
+ '" />'."\n".
+ '<input type="hidden" name="shownOnce'.$cts.'" value="0" />'."\n";
$cts++;
}
$request->print($prnmsg);
@@ -1196,7 +1334,7 @@ sub submission {
#
$request->print(<<KEYWORDS);
<b>Keyword Options:</b>
-<a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>List</a>
+<a href="javascript:keywords(document.SCORE)"; TARGET=_self>List</a>
<a href="#" onMouseDown="javascript:getSel(); return false"
CLASS="page">Paste Selection to List</a>
<a href="javascript:kwhighlight()"; TARGET=_self>Highlight Attribute</a><br /><br />
@@ -1216,22 +1354,20 @@ KEYWORDS
$request->print('<br /><br /><br />') if ($counter > 0);
$request->print(&show_problem($request,$symb,$uname,$udom,1,1));
}
-
my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
- my ($partlist,$handgrade) = &response_type($url);
+
+ my ($partlist,$handgrade) = &response_type($url,$symb);
# Display student info
$request->print(($counter == 0 ? '' : '<br />'));
my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'."\n".
'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n";
- $result.='<b>Fullname: </b>'.$ENV{'form.fullname'}.
- '<font color="#999999"> Username: '.$uname.'</font>'.
- '<font color="#999999"> Domain: '.$udom.'</font><br />'."\n";
+ $result.='<b>Fullname: </b>'.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).'<br />'."\n";
$result.='<input type="hidden" name="name'.$counter.
'" value="'.$ENV{'form.fullname'}.'" />'."\n";
- # If this is handgraded, then check for collaborators
+ # If any part of the problem is an essay-response (handgraded), then check for collaborators
my @col_fullnames;
my ($classlist,$fullname);
if ($ENV{'form.handgrade'} eq 'yes') {
@@ -1303,98 +1439,123 @@ KEYWORDS
$$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.'</a>';
$request->print($submitby);
} else {
- my ($string,$timestamp)=
- &get_last_submission (%record);
+ my ($string,$timestamp)= &get_last_submission (\%record);
my $lastsubonly=''.
($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
- $$timestamp).'';
+ $$timestamp)."</td></tr>\n";
if ($$timestamp eq '') {
- $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0].'</td></tr>'."\n";
+ $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0];
} else {
for my $part (sort keys(%$handgrade)) {
- foreach (@$string) {
- my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
- if ($part eq ($partid.'_'.$respid)) {
- my ($ressub,$subval) = split(/:/,$_,2);
-# Similarity check
- my $similar='';
- my ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);
- if ($osim) {
- $osim=int($osim*100.0);
- $similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.'% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).
- '</font></h3><blockquote><i>'.
- &keywords_highlight($oessay).'</i></blockquote><hr />';
- }
- $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
- $partid.'</b> <font color="#999999">( ID '.$respid.
- ' )</font> '.
- ($record{"resource.$partid.$respid.uploadedurl"}?
- '<a href="'.
- &Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).
- '"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />':'').
- '<b>Answer: </b><blockquote>'.
- &keywords_highlight($subval).'</blockquote><br /> '.$similar.'</td></tr>'."\n"
- if ($ENV{'form.lastSub'} eq 'lastonly' ||
- ($ENV{'form.lastSub'} eq 'hdgrade' &&
- $$handgrade{$part} =~ /:yes$/));
+ my ($responsetype,$foo) = split(/:/,$$handgrade{$part});
+ my ($partid,$respid) = split(/_/,$part);
+ if (!exists($record{'resource.'.$partid.'.'.$respid.'.submission'})) {
+ $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+ $partid.'</b> <font color="#999999">( ID '.$respid.
+ ' )</font> '.
+ '<font color="red">Nothing submitted - no attempts</font><br /><br />';
+ } else {
+ foreach (@$string) {
+ my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
+ if ($part eq ($partid.'_'.$respid)) {
+ my ($ressub,$subval) = split(/:/,$_,2);
+ # Similarity check
+ my $similar='';
+ my ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);
+ if ($osim) {
+ $osim=int($osim*100.0);
+ $similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.
+ '% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).
+ '</font></h3><blockquote><i>'.
+ &keywords_highlight($oessay).'</i></blockquote><hr />';
+ }
+ $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+ $partid.'</b> <font color="#999999">( ID '.$respid.
+ ' )</font> '.
+ ($record{"resource.$partid.$respid.uploadedurl"}?
+ '<a href="'.
+ &Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).
+ '"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> '.
+ '<font color="red" size="1">Like all files provided by users, '.
+ 'this file may contain virusses</font><br />':'').
+ '<b>Submitted Answer: </b>'.
+ &cleanRecord($subval,$responsetype,$symb).
+ '<br /><br />'.$similar."\n"
+ if ($ENV{'form.lastSub'} eq 'lastonly' ||
+ ($ENV{'form.lastSub'} eq 'hdgrade' &&
+ $$handgrade{$part} =~ /:yes$/));
+ }
}
}
}
}
- $lastsubonly.='</td></tr>'."\n";
+ $lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
$request->print($lastsubonly);
}
- } else {
+ } elsif ($ENV{'form.lastSub'} eq 'datesub') {
+ my (undef,$responseType,undef,$parts) = &showResourceInfo($url);
+ $request->print(&displaySubByDates(\$symb,\%record,$parts,$responseType,$checkIcon));
+ } elsif ($ENV{'form.lastSub'} =~ /^(last|all)$/) {
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
$ENV{'request.course.id'},
$last,'.submission',
'Apache::grades::keywords_highlight'));
}
+
+ $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
+ .$udom.'" />'."\n");
# return if view submission with no grading option
if ($ENV{'form.showgrading'} eq '' || (!&canmodify($usec))) {
- $request->print('</td></tr></table></td></tr></table></form>'."\n");
- $request->print(&show_grading_menu_form($symb,$url))
+ my $toGrade.='<input type="button" value="Grade Student" '.
+ 'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''
+ .$counter.'\');" TARGET=_self> '."\n" if (&canmodify($usec));
+ $toGrade.='</td></tr></table></td></tr></table></form>'."\n";
+ $toGrade.=&show_grading_menu_form($symb,$url)
if (($ENV{'form.command'} eq 'submission') ||
($ENV{'form.command'} eq 'processGroup' && $counter == $total));
+ $request = print($toGrade);
return;
}
- # Grading options
- $result='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
- '<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
- '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
- .$udom.'" />'."\n";
- my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
- my $msgfor = $givenn.' '.$lastname;
- if (scalar(@col_fullnames) > 0) {
- my $lastone = pop @col_fullnames;
- $msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
- }
- $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
- $result.='<tr><td bgcolor="#ffffff">'."\n".
- ' <a href="javascript:msgCenter(document.SCORE,'.$counter.
- ',\''.$msgfor.'\')"; TARGET=_self>'.
- 'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> '.
- '<img src="'.$request->dir_config('lonIconsURL').
- '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
- '<br /> (Message will be sent when you click on Save & Next below.)'."\n"
- if ($ENV{'form.handgrade'} eq 'yes');
- $request->print($result);
+ # essay grading message center
+ if ($ENV{'form.handgrade'} eq 'yes') {
+ my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
+ my $msgfor = $givenn.' '.$lastname;
+ if (scalar(@col_fullnames) > 0) {
+ my $lastone = pop @col_fullnames;
+ $msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
+ }
+ $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
+ $result='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
+ '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
+ $result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.
+ ',\''.$msgfor.'\')"; TARGET=_self>'.
+ 'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> '.
+ '<img src="'.$request->dir_config('lonIconsURL').
+ '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
+ '<br /> (Message will be sent when you click on Save & Next below.)'."\n"
+ if ($ENV{'form.handgrade'} eq 'yes');
+ $request->print($result);
+ }
my %seen = ();
my @partlist;
+ my @gradePartRespid;
for (sort keys(%$handgrade)) {
my ($partid,$respid) = split(/_/);
next if ($seen{$partid} > 0);
$seen{$partid}++;
- next if ($$handgrade{$_} =~ /:no$/);
+ next if ($$handgrade{$_} =~ /:no$/ && $ENV{'form.lastSub'} =~ /^(hdgrade)$/);
push @partlist,$partid;
+ push @gradePartRespid,$partid.'.'.$respid;
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
}
$result='<input type="hidden" name="partlist'.$counter.
'" value="'.(join ":",@partlist).'" />'."\n";
+ $result.='<input type="hidden" name="gradePartRespid'.
+ '" value="'.(join ":",@gradePartRespid).'" />'."\n" if ($counter == 0);
my $ctr = 0;
while ($ctr < scalar(@partlist)) {
$result.='<input type="hidden" name="partid'.$counter.'_'.$ctr.'" value="'.
@@ -1405,28 +1566,22 @@ KEYWORDS
# print end of form
if ($counter == $total) {
- my $endform='<table border="0"><tr><td>'.
- '<input type="hidden" name="gradeOpt" value="" />'."\n";
- if ($ENV{'form.handgrade'} eq 'yes') {
- $endform.='<input type="button" value="Save & Next" '.
- 'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
- $total.','.scalar(@partlist).');" TARGET=_self> '."\n";
- my $ntstu ='<select name="NTSTU">'.
- '<option>1</option><option>2</option>'.
- '<option>3</option><option>5</option>'.
- '<option>7</option><option>10</option></select>'."\n";
- my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
- $ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
- $endform.=$ntstu.'student(s) ';
- } else {
- $endform.='<input type="hidden" name="NTSTU" value="1" />'."\n";
- }
- $endform.='<input type="button" value="Next" '.
- 'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> '."\n".
- '<input type="button" value="Previous" '.
- 'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> ';
- $endform.='(Next and Previous do not save the scores.)'."\n"
- if ($ENV{'form.handgrade'} eq 'yes');
+ my $endform='<table border="0"><tr><td>'."\n";
+ $endform.='<input type="button" value="Save & Next" '.
+ 'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
+ $total.','.scalar(@partlist).');" TARGET=_self> '."\n";
+ my $ntstu ='<select name="NTSTU">'.
+ '<option>1</option><option>2</option>'.
+ '<option>3</option><option>5</option>'.
+ '<option>7</option><option>10</option></select>'."\n";
+ my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
+ $ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
+ $endform.=$ntstu.'student(s) ';
+ $endform.='<input type="button" value="Previous" '.
+ 'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> '."\n".
+ '<input type="button" value="Next" '.
+ 'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> ';
+ $endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
$endform.='</td><tr></table></form>';
$endform.=&show_grading_menu_form($symb,$url);
$request->print($endform);
@@ -1436,15 +1591,15 @@ KEYWORDS
#--- Retrieve the last submission for all the parts
sub get_last_submission {
- my (%returnhash)=@_;
+ my ($returnhash)=@_;
my (@string,$timestamp);
- if ($returnhash{'version'}) {
+ if ($$returnhash{'version'}) {
my %lasthash=();
my ($version);
- for ($version=1;$version<=$returnhash{'version'};$version++) {
- foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
- $lasthash{$_}=$returnhash{$version.':'.$_};
- $timestamp = scalar(localtime($returnhash{$version.':timestamp'}));
+ for ($version=1;$version<=$$returnhash{'version'};$version++) {
+ foreach (sort(split(/\:/,$$returnhash{$version.':keys'}))) {
+ $lasthash{$_}=$$returnhash{$version.':'.$_};
+ $timestamp = scalar(localtime($$returnhash{$version.':timestamp'}));
}
}
foreach ((keys %lasthash)) {
@@ -1456,7 +1611,7 @@ sub get_last_submission {
}
}
}
- @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
+ @string = $string[0] eq '' ? '<font color="red">Nothing submitted - no attempts.</font>' : @string;
return \@string,\$timestamp;
}
@@ -1468,13 +1623,8 @@ sub keywords_highlight {
(my $styleoff = $styleon) =~ s/\</\<\//;
my @keylist = split(/[,\s+]/,$ENV{'form.keywords'});
foreach (@keylist) {
- $string =~ s/\b\Q$_\E(\b|\.)/\<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff\<\/font\>/gi;
+ $string =~ s/\b\Q$_\E(\b|\.)/<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;
}
- # This is not really the right place to do this, but I cannot find a
- # better one at this time. So here we go - the m in the s:::mg causes
- # ^ to match the beginning of a new line. So we replace(???) the beginning
- # of the line with <br /> to make things formatted a little better.
- $string =~ s:^:<br />:mg;
return $string;
}
@@ -1486,7 +1636,6 @@ sub processHandGrade {
my $button = $ENV{'form.gradeOpt'};
my $ngrade = $ENV{'form.NCT'};
my $ntstu = $ENV{'form.NTSTU'};
-
if ($button eq 'Save & Next') {
my $ctr = 0;
while ($ctr < $ngrade) {
@@ -1520,7 +1669,8 @@ sub processHandGrade {
if ($ENV{'form.collaborator'.$ctr}) {
my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
foreach (@collaborators) {
- my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,$ENV{'form.unamedom'.$ctr});
+ my ($errorflag,$pts,$wgt) =
+ &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,$ENV{'form.unamedom'.$ctr});
if ($errorflag eq 'not_allowed') {
$request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
next;
@@ -1537,48 +1687,49 @@ sub processHandGrade {
}
}
- # Keywords sorted in alphabatical order
- my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
- my %keyhash = ();
- $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g;
- $ENV{'form.keywords'} =~ s/^\s+|\s+$//;
- my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
- $ENV{'form.keywords'} = join(' ',@keywords);
- $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'};
- $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'};
- $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'};
- $keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'};
- $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
-
- # message center - Order of message gets changed. Blank line is eliminated.
- # New messages are saved in ENV for the next student.
- # All messages are saved in nohist_handgrade.db
- my ($ctr,$idx) = (1,1);
- while ($ctr <= $ENV{'form.savemsgN'}) {
- if ($ENV{'form.savemsg'.$ctr} ne '') {
- $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
- $idx++;
+ if ($ENV{'form.handgrade'} eq 'yes') {
+ # Keywords sorted in alphabatical order
+ my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ my %keyhash = ();
+ $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g;
+ $ENV{'form.keywords'} =~ s/^\s+|\s+$//;
+ my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
+ $ENV{'form.keywords'} = join(' ',@keywords);
+ $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'};
+ $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'};
+ $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'};
+ $keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'};
+ $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
+
+ # message center - Order of message gets changed. Blank line is eliminated.
+ # New messages are saved in ENV for the next student.
+ # All messages are saved in nohist_handgrade.db
+ my ($ctr,$idx) = (1,1);
+ while ($ctr <= $ENV{'form.savemsgN'}) {
+ if ($ENV{'form.savemsg'.$ctr} ne '') {
+ $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
+ $idx++;
+ }
+ $ctr++;
}
- $ctr++;
- }
- $ctr = 0;
- while ($ctr < $ngrade) {
- if ($ENV{'form.newmsg'.$ctr} ne '') {
- $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
- $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
- $idx++;
+ $ctr = 0;
+ while ($ctr < $ngrade) {
+ if ($ENV{'form.newmsg'.$ctr} ne '') {
+ $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+ $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+ $idx++;
+ }
+ $ctr++;
}
- $ctr++;
+ $ENV{'form.savemsgN'} = --$idx;
+ $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
+ my $putresult = &Apache::lonnet::put
+ ('nohist_handgrade',\%keyhash,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
}
- $ENV{'form.savemsgN'} = --$idx;
- $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
- my $putresult = &Apache::lonnet::put
- ('nohist_handgrade',\%keyhash,
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
# Called by Save & Refresh from Highlight Attribute Window
- my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
+ my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
if ($ENV{'form.refresh'} eq 'on') {
my ($ctr,$total) = (0,0);
while ($ctr < $ngrade) {
@@ -1597,10 +1748,20 @@ sub processHandGrade {
return '';
}
+# Go directly to grade student - from submission or link from chart page
+ if ($button eq 'Grade Student') {
+ (undef,undef,$ENV{'form.handgrade'},undef,undef) = &showResourceInfo($url);
+ my $processUser = $ENV{'form.unamedom'.$ENV{'form.studentNo'}};
+ ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$processUser);
+ $ENV{'form.fullname'} = $$fullname{$processUser};
+ &submission($request,0,0);
+ return '';
+ }
+
# Get the next/previous one or group of students
my $firststu = $ENV{'form.unamedom0'};
my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
- $ctr = 2;
+ my $ctr = 2;
while ($laststu eq '') {
$laststu = $ENV{'form.unamedom'.($ngrade-$ctr)};
$ctr++;
@@ -1620,21 +1781,19 @@ sub processHandGrade {
}
}
$ctr = 0;
- my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
@parsedlist = reverse @parsedlist if ($button eq 'Previous');
foreach my $student (@parsedlist) {
my ($uname,$udom) = split(/:/,$student);
if ($ENV{'form.submitonly'} eq 'yes') {
- my (%status) = &student_gradeStatus($ENV{'form.url'},$symb,$udom,$uname,$partlist) ;
+ my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
my $statusflg = '';
- foreach (keys(%status)) {
- $statusflg = 1 if ($status{$_} ne 'nothing');
- my ($foo,$partid,$foo1) = split(/\./);
- $statusflg = '' if ($status{'resource.'.$partid.'.submitted_by'} ne '');
+ foreach (split(/:/,$ENV{'form.gradePartRespid'})){
+ $statusflg = 1 if (exists ($record{'resource.'.$_.'.submission'}));
}
next if ($statusflg eq '');
}
push @nextlist,$student if ($ctr < $ntstu);
+ last if ($ctr == $ntstu);
$ctr++;
}
@@ -1669,14 +1828,23 @@ sub saveHandGrade {
my %newrecord = ();
my ($pts,$wgt) = ('','');
foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
- if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq 'excused') {
+ my $dropMenu = $ENV{'form.GD_SEL'.$newflg.'_'.$_};
+ if ($dropMenu eq 'excused') {
if ($record{'resource.'.$_.'.solved'} ne 'excused') {
$newrecord{'resource.'.$_.'.solved'} = 'excused';
if (exists($record{'resource.'.$_.'.awarded'})) {
$newrecord{'resource.'.$_.'.awarded'} = '';
}
+ $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
}
- } else {
+ } elsif ($dropMenu eq 'reset status'
+ && exists($record{'resource.'.$_.'.solved'})) { #don't bother if no old records -> no attempts
+ $newrecord{'resource.'.$_.'.tries'} = 0;
+ $newrecord{'resource.'.$_.'.solved'} = '';
+ $newrecord{'resource.'.$_.'.award'} = '';
+ $newrecord{'resource.'.$_.'.awarded'} = 0;
+ $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ } elsif ($dropMenu eq '') {
$pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ?
$ENV{'form.GD_BOX'.$newflg.'_'.$_} :
$ENV{'form.RADVAL'.$newflg.'_'.$_});
@@ -1684,6 +1852,7 @@ sub saveHandGrade {
$wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 :
$ENV{'form.WGT'.$newflg.'_'.$_};
my $partial= $pts/$wgt;
+ next if ($partial eq $record{'resource.'.$_.'.awarded'}); #do not update score for part if not changed.
$newrecord{'resource.'.$_.'.awarded'} = $partial
if ($record{'resource.'.$_.'.awarded'} ne $partial);
my $reckey = 'resource.'.$_.'.solved';
@@ -1696,7 +1865,7 @@ sub saveHandGrade {
}
$newrecord{'resource.'.$_.'.submitted_by'} = $submitter
if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter));
- $newrecord{'resource.'.$_.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
}
}
@@ -1718,10 +1887,10 @@ sub viewgrades_js {
$request->print(<<VIEWJAVASCRIPT);
<script type="text/javascript" language="javascript">
function writePoint(partid,weight,point) {
- var radioButton = eval("document.classgrade.RADVAL_"+partid);
- var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+ var radioButton = document.classgrade["RADVAL_"+partid];
+ var textbox = document.classgrade["TEXTVAL_"+partid];
if (point == "textval") {
- var point = eval("document.classgrade.TEXTVAL_"+partid+".value");
+ point = document.classgrade["TEXTVAL_"+partid].value;
if (isNaN(point) || parseFloat(point) < 0) {
alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
var resetbox = false;
@@ -1752,15 +1921,13 @@ sub viewgrades_js {
}
} else {
- textbox.value = point;
+ textbox.value = parseFloat(point);
}
for (i=0;i<document.classgrade.total.value;i++) {
- var user = eval("document.classgrade.ctr"+i+".value");
- var scorename = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded");
- var saveval = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved_s.value");
- var selname = eval("document.classgrade.GD_"+user+"_"+partid+"_solved");
+ var user = document.classgrade["ctr"+i].value;
+ var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+ var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+ var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
if (saveval != "correct") {
scorename.value = point;
if (selname[0].selected != true) {
@@ -1768,15 +1935,14 @@ sub viewgrades_js {
}
}
}
- var selval = eval("document.classgrade.SELVAL_"+partid);
- selval[0].selected = true;
+ document.classgrade["SELVAL_"+partid][0].selected = true;
}
function writeRadText(partid,weight) {
- var selval = eval("document.classgrade.SELVAL_"+partid);
- var radioButton = eval("document.classgrade.RADVAL_"+partid);
- var textbox = eval("document.classgrade.TEXTVAL_"+partid);
- if (selval[1].selected) {
+ var selval = document.classgrade["SELVAL_"+partid];
+ var radioButton = document.classgrade["RADVAL_"+partid];
+ var textbox = document.classgrade["TEXTVAL_"+partid];
+ if (selval[1].selected || selval[2].selected) {
for (var i=0; i<radioButton.length; i++) {
radioButton[i].checked=false;
@@ -1784,30 +1950,29 @@ sub viewgrades_js {
textbox.value = "";
for (i=0;i<document.classgrade.total.value;i++) {
- var user = eval("document.classgrade.ctr"+i+".value");
- var scorename = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded");
- var saveval = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved_s.value");
- var selname = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved");
+ var user = document.classgrade["ctr"+i].value;
+ var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+ var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+ var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
if (saveval != "correct") {
scorename.value = "";
- selname[1].selected = true;
+ if (selval[1].selected) {
+ selname[1].selected = true;
+ } else {
+ selname[2].selected = true;
+ if (Number(document.classgrade["GD_"+user+"_"+partid+"_tries"].value))
+ {document.classgrade["GD_"+user+"_"+partid+"_tries"].value = '0';}
+ }
}
}
} else {
for (i=0;i<document.classgrade.total.value;i++) {
- var user = eval("document.classgrade.ctr"+i+".value");
- var scorename = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded");
- var saveval = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved_s.value");
- var selname = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved");
+ var user = document.classgrade["ctr"+i].value;
+ var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+ var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+ var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
if (saveval != "correct") {
- scorename.value = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded_s.value");;
+ scorename.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
selname[0].selected = true;
}
}
@@ -1815,10 +1980,10 @@ sub viewgrades_js {
}
function changeSelect(partid,user) {
- var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_solved");
- var textbox = eval("document.classgrade.GD_"+user+'_'+partid+"_awarded");
+ var selval = document.classgrade["GD_"+user+'_'+partid+"_solved"];
+ var textbox = document.classgrade["GD_"+user+'_'+partid+"_awarded"];
var point = textbox.value;
- var weight = eval("document.classgrade.weight_"+partid+".value");
+ var weight = document.classgrade["weight_"+partid].value;
if (isNaN(point) || parseFloat(point) < 0) {
alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
@@ -1837,19 +2002,21 @@ sub viewgrades_js {
}
function changeOneScore(partid,user) {
- var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_solved");
- if (selval[1].selected) {
- var boxval = eval("document.classgrade.GD_"+user+'_'+partid+"_awarded");
- boxval.value = "";
+ var selval = document.classgrade["GD_"+user+'_'+partid+"_solved"];
+ if (selval[1].selected || selval[2].selected) {
+ document.classgrade["GD_"+user+'_'+partid+"_awarded"].value = "";
+ if (selval[2].selected) {
+ document.classgrade["GD_"+user+'_'+partid+"_tries"].value = "0";
+ }
}
}
function resetEntry(numpart) {
for (ctpart=0;ctpart<numpart;ctpart++) {
- var partid = eval("document.classgrade.partid_"+ctpart+".value");
- var radioButton = eval("document.classgrade.RADVAL_"+partid);
- var textbox = eval("document.classgrade.TEXTVAL_"+partid);
- var selval = eval("document.classgrade.SELVAL_"+partid);
+ var partid = document.classgrade["partid_"+ctpart].value;
+ var radioButton = document.classgrade["RADVAL_"+partid];
+ var textbox = document.classgrade["TEXTVAL_"+partid];
+ var selval = document.classgrade["SELVAL_"+partid];
for (var i=0; i<radioButton.length; i++) {
radioButton[i].checked=false;
@@ -1858,16 +2025,13 @@ sub viewgrades_js {
selval[0].selected = true;
for (i=0;i<document.classgrade.total.value;i++) {
- var user = eval("document.classgrade.ctr"+i+".value");
- var resetscore = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded");
- resetscore.value = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded_s.value");
-
- var saveselval = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved_s.value");
-
- var selname = eval("document.classgrade.GD_"+user+"_"+partid+"_solved");
+ var user = document.classgrade["ctr"+i].value;
+ var resetscore = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+ resetscore.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
+ var resettries = document.classgrade["GD_"+user+"_"+partid+"_tries"];
+ resettries.value = document.classgrade["GD_"+user+"_"+partid+"_tries_s"].value;
+ var saveselval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+ var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
if (saveselval == "excused") {
if (selname[1].selected == false) { selname[1].selected = true;}
} else {
@@ -1889,7 +2053,7 @@ sub viewgrades {
my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'});
my $result='<h3><font color="#339933">Manual Grading</font></h3>';
- $result.='<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
+ $result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
#view individual student submission form - called using Javascript viewOneStudent
$result.=&jscriptNform($url,$symb);
@@ -1901,21 +2065,23 @@ sub viewgrades {
'<input type="hidden" name="command" value="editgrades" />'."\n".
'<input type="hidden" name="section" value="'.$ENV{'form.section'}.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
- $result.='<h3>Assign Common Grade To ';
+ my $sectionClass;
if ($ENV{'form.section'} eq 'all') {
- $result.='Class </h3>';
+ $sectionClass='Class </h3>';
} elsif ($ENV{'form.section'} eq 'no') {
- $result.='Students in no Section </h3>';
+ $sectionClass='Students in no Section </h3>';
} else {
- $result.='Students in Section '.$ENV{'form.section'}.'</h3>';
+ $sectionClass='Students in Section '.$ENV{'form.section'}.'</h3>';
}
+ $result.='<h3>Assign Common Grade To '.$sectionClass;
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
'<table border=0><tr bgcolor="#ffffdd"><td>';
#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem
- my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
+ my ($partlist,$handgrade) = &response_type($url,$symb);
my %weight = ();
my $ctsparts = 0;
$result.='<table border="0">';
@@ -1951,32 +2117,25 @@ sub viewgrades {
'onChange="javascript:writeRadText(\''.$partid.'\','.
$weight{$partid}.')"> '.
'<option selected="on"> </option>'.
- '<option>excused</option></select></td></tr>'."\n";
+ '<option>excused</option>'.
+ '<option>reset status</option></select></td></tr>'."\n";
$ctsparts++;
}
$result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
$result.='<input type="button" value="Reset" '.
'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self>';
-# $result.=' <input type="button" value="Submit Changes" name="subButton1'.
-# 'onClick="javascript:submit();" TARGET=_self />'."\n";
#table listing all the students in a section/class
#header of table
- $result.= '<h3>Assign Grade to Specific Students in ';
- if ($ENV{'form.section'} eq 'all') {
- $result.='the Class </h3>';
- } elsif ($ENV{'form.section'} eq 'no') {
- $result.='no Section </h3>';
- } else {
- $result.='Section '.$ENV{'form.section'}.'</h3>';
- }
+ $result.= '<h3>Assign Grade to Specific Students in '.$sectionClass;
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
- '<table border=0><tr bgcolor="#deffff">'.
- '<td><b>Fullname</b> <font color="#999999">(Username)</font></td>'."\n";
+ '<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'.
+ '<td>'.&nameUserString('header')."</td>\n";
my (@parts) = sort(&getpartlist($url));
foreach my $part (@parts) {
my $display=&Apache::lonnet::metadata($url,$part.'.display');
+ $display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
if ($display =~ /^Partial Credit Factor/) {
my ($partid) = &split_part_type($part);
@@ -1997,17 +2156,18 @@ sub viewgrades {
my $uname = $_;
$uname=~s/:/_/;
$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$uname.'" />'."\n";
- $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
- $_,$$fullname{$_},\@parts,\%weight);
$ctr++;
+ $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
+ $_,$$fullname{$_},\@parts,\%weight,$ctr);
}
$result.='</table></td></tr></table>';
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
- $result.='<input type="button" value="Submit Changes" '.
+ $result.='<input type="button" value="Save" '.
'onClick="javascript:submit();" TARGET=_self /></form>'."\n";
if (scalar(%$fullname) eq 0) {
my $colspan=3+scalar(@parts);
- $result='<font color="red">There are no students in section "'.$ENV{'form.section'}.'" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';
+ $result='<font color="red">There are no students in section "'.$ENV{'form.section'}.
+ '" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';
}
$result.=&show_grading_menu_form($symb,$url);
return $result;
@@ -2015,11 +2175,11 @@ sub viewgrades {
#--- call by previous routine to display each student
sub viewstudentgrade {
- my ($url,$symb,$courseid,$student,$fullname,$parts,$weight) = @_;
+ my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr) = @_;
my ($uname,$udom) = split(/:/,$student);
$student=~s/:/_/;
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
- my $result='<tr bgcolor="#ffffdd"><td>'.
+ my $result='<tr bgcolor="#ffffdd"><td align="right">'.$ctr.' </td><td> '.
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
'\')"; TARGET=_self>'.$fullname.'</a> '.
'<font color="#999999">('.$uname.($ENV{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
@@ -2039,14 +2199,13 @@ sub viewstudentgrade {
$status = 'nothing' if ($status eq '');
$result.='<input type="hidden" name="'.'GD_'.$student.'_'.
$part.'_solved_s" value="'.$status.'" />'."\n";
- $result.='<td align="middle"><select name="'.
+ $result.='<td align="middle"> <select name="'.
'GD_'.$student.'_'.$part.'_solved" '.
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
- my $optsel = '<option selected="on"> </option><option>excused</option>'."\n";
- $optsel = '<option> </option><option selected="on">excused</option>'."\n"
- if ($status eq 'excused');
- $result.=$optsel;
- $result.="</select></td>\n";
+ $result.= (($status eq 'excused') ? '<option> </option><option selected="on">excused</option>'
+ : '<option selected="on"> </option><option>excused</option>')."\n";
+ $result.='<option>reset status</option>';
+ $result.="</select> </td>\n";
} else {
$result.='<input type="hidden" name="'.
'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
@@ -2068,11 +2227,13 @@ sub editgrades {
my $symb=$ENV{'form.symb'};
my $url =$ENV{'form.url'};
my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
- $title.='<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";
+ $title.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";
$title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";
+
my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
$result.= '<table border="0"><tr bgcolor="#deffff">'.
- '<td rowspan=2><b>Username</b></td><td rowspan=2><b>Domain</b></td><td rowspan=2><b>Fullname</b></td>'."\n";
+ '<td rowspan=2 valign="center"> <b>No.</b> </td>'.
+ '<td rowspan=2 valign="center">'.&nameUserString('header')."</td>\n";
my %scoreptr = (
'correct' =>'correct_by_override',
@@ -2106,8 +2267,9 @@ sub editgrades {
if ($type eq 'awarded' || $type eq 'solved') { next; }
my $display=&Apache::lonnet::metadata($url,$stores.'.display');
$display =~ s/\[Part: (\w)+\]//;
- $header .= '<td align="center"> <b>Old</b> '.$display.' </td>'.
- '<td align="center"> <b>New</b> '.$display.' </td>';
+ $display =~ s/Number of Attempts/Tries/;
+ $header .= '<td align="center"> <b>Old '.$display.'</b> </td>'.
+ '<td align="center"> <b>New '.$display.'</b> </td>';
$columns{$partid}+=2;
}
}
@@ -2121,6 +2283,7 @@ sub editgrades {
$result .= $header;
$result .= '</tr>'."\n";
my $noupdate;
+ my ($updateCtr,$noupdateCtr) = (1,1);
for ($i=0; $i<$ENV{'form.total'}; $i++) {
my $line;
my $user = $ENV{'form.ctr'.$i};
@@ -2129,12 +2292,10 @@ sub editgrades {
my ($uname,$udom)=split(/_/,$user);
my %newrecord;
my $updateflag = 0;
- $line .= '<tr bgcolor="#ffffde"><td>'.$uname.' </td><td>'.
- $udom.' </td><td>'.
- $$fullname{$usercolon}.' </td>';
+ $line .= '<td>'.&nameUserString(undef,$$fullname{$usercolon},$uname,$udom).'</td>';
my $usec=$classlist->{"$uname:$udom"}[5];
if (!&canmodify($usec)) {
- my $numcols=scalar(@partid)*(scalar(@parts)-1)*2;
+ my $numcols=scalar(@partid)*4+2;
$noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
next;
}
@@ -2155,8 +2316,19 @@ sub editgrades {
} elsif ($partial == 0) {
$score = 'incorrect_by_override';
}
- $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_solved'} eq 'excused') &&
- ($score ne 'excused'));
+ my $dropMenu = $ENV{'form.GD_'.$user.'_'.$_.'_solved'};
+ $score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));
+
+ if ($dropMenu eq 'reset status' &&
+ $old_score ne '') { # ignore if no previous attempts => nothing to reset
+ $newrecord{'resource.'.$_.'.tries'} = 0;
+ $newrecord{'resource.'.$_.'.solved'} = '';
+ $newrecord{'resource.'.$_.'.award'} = '';
+ $newrecord{'resource.'.$_.'.awarded'} = 0;
+ $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $updateflag = 1;
+ }
+
$line .= '<td align="center">'.$old_aw.' </td>'.
'<td align="center">'.$awarded.
($score eq 'excused' ? $score : '').' </td>';
@@ -2177,7 +2349,7 @@ sub editgrades {
my $awarded = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type};
if ($awarded ne '' && $awarded ne $old_aw) {
$newrecord{'resource.'.$part.'.'.$type}= $awarded;
- $newrecord{'resource.'.$part.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $newrecord{'resource.'.$part.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
$updateflag=1;
}
$line .= '<td align="center">'.$old_aw.' </td>'.
@@ -2189,18 +2361,21 @@ sub editgrades {
$count++;
&Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
$udom,$uname);
- $result.=$line;
+ $result.='<tr bgcolor="#ffffde"><td align="right"> '.$updateCtr.' </td>'.$line;
+ $updateCtr++;
} else {
- $noupdate.=$line;
+ $noupdate.='<tr bgcolor="#ffffde"><td align="right"> '.$noupdateCtr.' </td>'.$line;
+ $noupdateCtr++;
}
}
if ($noupdate) {
- my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
- $result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occured For the Students Below</td></tr>'.$noupdate;
+# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
+ my $numcols=scalar(@partid)*4+2;
+ $result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr>'.$noupdate;
}
$result .= '</table></td></tr></table>'."\n".
&show_grading_menu_form ($symb,$url);
- my $msg = '<b>Number of records updated = '.$rec_update.
+ my $msg = '<br /><b>Number of records updated = '.$rec_update.
' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.
'<b>Total number of students = '.$ENV{'form.total'}.'</b><br />';
return $title.$msg.$result;
@@ -2306,19 +2481,8 @@ sub csvuploadmap_header {
$javascript=&csvupload_javascript_forward_associate();
}
- my $result='<table border="0">';
- $result.='<tr><td colspan=3><font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>';
- my ($partlist,$handgrade) = &response_type($url);
- my ($resptype,$hdgrade)=('','no');
- for (sort keys(%$handgrade)) {
- my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
- $resptype = $responsetype;
- $hdgrade = $handgrade if ($handgrade eq 'yes');
- $result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
- '<td><b>Type: </b>'.$responsetype.'</td>'.
- '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
- }
- $result.='</table>';
+ my ($result) = &showResourceInfo($url,$ENV{'form.probTitle'});
+
$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<h3><font color="#339933">Uploading Class Grades</font></h3>
@@ -2346,7 +2510,7 @@ to this page if the data selected is ins
$javascript
</script>
ENDPICK
-return '';
+ return '';
}
@@ -2392,9 +2556,11 @@ sub upcsvScores_form {
</script>
CSVFORMJS
$ENV{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+ my ($table) = &showResourceInfo($url,$ENV{'form.probTitle'});
+ $result.=$table;
$result.='<br /><table width=100% border=0><tr><td bgcolor="#777777">'."\n";
$result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
- $result.=' <b>Specify a file containing the class scores for problem - '.$ENV{'form.probTitle'}.
+ $result.=' <b>Specify a file containing the class scores for current resource'.
'.</b></td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";
my $upfile_select=&Apache::loncommon::upfile_select_html();
@@ -2413,7 +2579,6 @@ ENDUPFORM
$result.='</td></tr></table>'."\n";
$result.='</td></tr></table><br /><br />'."\n";
$result.=&show_grading_menu_form($symb,$url);
-
return $result;
}
@@ -2527,7 +2692,7 @@ sub csvuploadassign {
#
#-------------------------------------------------------------------
#
-#-------------- Next few routines handles grading by page/sequence
+#-------------- Next few routines handle grading by page/sequence
#
#--- Select a page/sequence and a student to grade
sub pickStudentPage {
@@ -2541,41 +2706,15 @@ function checkPickOne(formname) {
alert("Please select the student you wish to grade.");
return;
}
- var ptr = pullDownSelection(formname.selectpage);
- formname.page.value = eval("formname.page"+ptr+".value");
- formname.title.value = eval("formname.title"+ptr+".value");
+ ptr = pullDownSelection(formname.selectpage);
+ formname.page.value = formname["page"+ptr].value;
+ formname.title.value = formname["title"+ptr].value;
formname.submit();
}
-function radioSelection(radioButton) {
- var selection=null;
- if (radioButton.length > 1) {
- for (var i=0; i<radioButton.length; i++) {
- if (radioButton[i].checked) {
- return radioButton[i].value;
- }
- }
- } else {
- if (radioButton.checked) return radioButton.value;
- }
- return selection;
-}
-
-function pullDownSelection(selectOne) {
- var selection="";
- if (selectOne.length > 1) {
- for (var i=0; i<selectOne.length; i++) {
- if (selectOne[i].selected) {
- return selectOne[i].value;
- }
- }
- } else {
- if (selectOne.selected) return selectOne.value;
- }
-}
</script>
LISTJAVASCRIPT
-
+ &commonJSfunctions($request);
my ($symb,$url) = &get_symb_and_url($request);
my $cdom = $ENV{"course.$ENV{'request.course.id'}.domain"};
my $cnum = $ENV{"course.$ENV{'request.course.id'}.num"};
@@ -2607,50 +2746,49 @@ LISTJAVASCRIPT
$result.='<input type="hidden" name="page" />'."\n".
'<input type="hidden" name="title" />'."\n";
- $result.=' <b>View Problems: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
+ $result.=' <b>View Problems Text: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
'<input type="radio" name="vProb" value="yes" /> yes '."<br>\n";
$result.=' <b>Submission Details: </b>'.
'<input type="radio" name="lastSub" value="none" /> none'."\n".
- '<input type="radio" name="lastSub" value="datesub" checked /> dates and submissions'."\n".
+ '<input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions'."\n".
'<input type="radio" name="lastSub" value="all" /> all details'."\n";
$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n".
- '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
'<input type="hidden" name="command" value="displayPage" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."<br />\n";
$result.=' <input type="button" '.
- 'onClick="javascript:checkPickOne(this.form);"value="Submit" /><br />'."\n";
+ 'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
$request->print($result);
- my $studentTable.=' <b>Select a student you wish to grade</b><br>'.
+ my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br>'.
'<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.
- '<td><b> Fullname <font color="#999999">(username)</font></b></td>'.
- '<td><b> Fullname <font color="#999999">(username)</font></b></td>'.
- '<td><b> Fullname <font color="#999999">(username)</font></b></td>'.
- '<td><b> Fullname <font color="#999999">(username)</font></b></td></tr>';
+ '<td align="right"> <b>No.</b></td>'.
+ '<td>'.&nameUserString('header').'</td>'.
+ '<td align="right"> <b>No.</b></td>'.
+ '<td>'.&nameUserString('header').'</td></tr>';
my (undef,undef,$fullname) = &getclasslist($getsec,'1');
my $ptr = 1;
foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
my ($uname,$udom) = split(/:/,$student);
- $studentTable.=($ptr%4 == 1 ? '<tr bgcolor="#ffffe6"><td>' : '</td><td>');
- $studentTable.='<input type="radio" name="student" value="'.$student.'" /> '.$$fullname{$student}.
- '<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font>'."\n";
- $studentTable.=($ptr%4 == 0 ? '</td></tr>' : '');
+ $studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');
+ $studentTable.='<td align="right">'.$ptr.' </td>';
+ $studentTable.='<td> <input type="radio" name="student" value="'.$student.'" /> '
+ .&nameUserString(undef,$$fullname{$student},$uname,$udom)."\n";
+ $studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
$ptr++;
}
- $studentTable.='</td><td> </td><td> </td><td> ' if ($ptr%4 == 2);
- $studentTable.='</td><td> </td><td> ' if ($ptr%4 == 3);
- $studentTable.='</td><td> ' if ($ptr%4 == 0);
+ $studentTable.='</td><td> </td><td> ' if ($ptr%2 == 0);
$studentTable.='</td></tr></table></td></tr></table>'."\n";
- $studentTable.='<br /> <input type="button" '.
- 'onClick="javascript:checkPickOne(this.form);"value="Submit" /></form>'."\n";
+ $studentTable.='<input type="button" '.
+ 'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
$studentTable.=&show_grading_menu_form($symb,$url);
$request->print($studentTable);
@@ -2661,53 +2799,22 @@ LISTJAVASCRIPT
sub getSymbMap {
my ($request) = @_;
my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
- $ENV{'request.course.fn'}.'_parms.db',1, 1);
-
- #my $res = $navmap->firstResource(); # temp resource to access constants
- $navmap->init();
-
- # End navmap using boilerplate
-
- my $iterator = Apache::lonnavmaps::iterator->new($navmap, undef, undef, undef, undef, 1, undef, 1);
- my $depth = 1;
- my $curRes = $iterator->next();
+ $ENV{'request.course.fn'}.'_parms.db');
+# $navmap->init();
my %symbx = ();
my @titles = ();
- my $minder=0;
- my $seenBeginMap = 0;
- while ($depth > 0 || !$seenBeginMap) {
- if ($curRes == $iterator->BEGIN_MAP()) {$depth++; $seenBeginMap = 1; }
- if ($curRes == $iterator->END_MAP()) { $depth--; }
-
- if (ref($curRes) && $curRes->is_map()) {
- my ($mapUrl, $id, $resUrl) = split(/___/, $curRes->symb()); # check map contains at least one problem
- my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
-
- my $mapiterator = $navmap->getIterator($map->map_start(),
- $map->map_finish());
-
- my $mapdepth = 1;
- my $countProblems = 0;
- $mapiterator->next(); # skip the first BEGIN_MAP
- my $mapcurRes = $mapiterator->next(); # for "current resource"
- while ($mapdepth > 0) {
- if($mapcurRes == $mapiterator->BEGIN_MAP) { $mapdepth++; }
- if($mapcurRes == $mapiterator->END_MAP) { $mapdepth--; }
-
- if (ref($mapcurRes) && $mapcurRes->is_problem() && !$mapcurRes->randomout) {
- $countProblems++;
- }
- $mapcurRes = $mapiterator->next();
- }
- if ($countProblems > 0) {
- my $title = $curRes->compTitle();
- push @titles,$minder.'.'.$title; # minder, just in case two titles are identical
- $symbx{$minder.'.'.$title} = $curRes->symb();
- $minder++;
- }
- }
- $curRes = $iterator->next();
+ my $minder = 0;
+
+ # Gather every sequence that has problems.
+ my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, 1);
+ for my $sequence ($navmap->getById('0.0'), @sequences) {
+ if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
+ my $title = $minder.'.'.$sequence->compTitle();
+ push @titles, $title; # minder in case two titles are identical
+ $symbx{$title} = $sequence->symb();
+ $minder++;
+ }
}
$navmap->untieHashes();
@@ -2733,9 +2840,8 @@ sub displayPage {
return;
}
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>';
- $result.='<h3> Student: '.$$fullname{$ENV{'form.student'}}.
- '<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n";
-
+ $result.='<h3> Student: '.&nameUserString(undef,$$fullname{$ENV{'form.student'}},$uname,$udom).
+ '</h3>'."\n";
&sub_page_js($request);
$request->print($result);
@@ -2749,22 +2855,24 @@ sub displayPage {
my $studentTable='<form action="/adm/grades" method="post" name="gradePage">'."\n".
'<input type="hidden" name="command" value="gradeByPage" />'."\n".
+ '<input type="hidden" name="fullname" value="'.$$fullname{$ENV{'form.student'}}.'" />'."\n".
'<input type="hidden" name="student" value="'.$ENV{'form.student'}.'" />'."\n".
'<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n".
'<input type="hidden" name="title" value="'.$ENV{'form.title'}.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ '<input type="hidden" name="overRideScore" value="no" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n";
my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';
- $studentTable.=' <b>Note:</b> A problem graded correct ('.$checkIcon.
- ') by the computer cannot be changed.'."\n".
+ $studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
+ ' symbol.'."\n".
'<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.
- '<td align="center"><b> No </b></td>'.
- '<td><b> '.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem View').'/Grade</b></td></tr>';
+ '<td align="center"><b> Prob. </b></td>'.
+ '<td><b> '.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
my ($depth,$question) = (1,1);
$iterator->next(); # skip the first BEGIN_MAP
@@ -2773,7 +2881,7 @@ sub displayPage {
if($curRes == $iterator->BEGIN_MAP) { $depth++; }
if($curRes == $iterator->END_MAP) { $depth--; }
- if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+ if (ref($curRes) && $curRes->is_problem()) {
my $parts = $curRes->parts();
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
@@ -2783,16 +2891,14 @@ sub displayPage {
if ($ENV{'form.vProb'} eq 'yes') {
$studentTable.=&show_problem($request,$symbx,$uname,$udom,1);
} else {
- my $companswer = &Apache::loncommon::get_student_answers(
- $symbx,$uname,$udom,$ENV{'request.course.id'});
+ my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$ENV{'request.course.id'});
$companswer =~ s|<form(.*?)>||g;
$companswer =~ s|</form>||g;
-
# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
-# $request->print('match='.$1.'<br>');
-# $companswer =~ s/$1/ /s;
+# $companswer =~ s/$1/ /ms;
+# $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;
}
@@ -2802,40 +2908,11 @@ sub displayPage {
if ($record{'version'} eq '') {
$studentTable.='<br /> <font color="red">No recorded submission for this problem</font><br />';
} else {
- $studentTable.='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
- '<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
- '<td><b>Date/Time</b></td>'.
- '<td><b>Submission</b></td>'.
- '<td><b>Status </b></td></tr>';
- my ($version);
- for ($version=1;$version<=$record{'version'};$version++) {
- my $timestamp = scalar(localtime($record{$version.':timestamp'}));
- $studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
- my @versionKeys = split(/\:/,$record{$version.':keys'});
- my @displaySub = ();
- foreach my $partid (@{$parts}) {
- my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
- next if ($record{"$version:resource.$partid.solved"} eq '');
-# next if ($record{"$version:resource.$partid.award"} eq 'APPROX_ANS' &&
-# $record{"$version:resource.$partid.solved"} eq '');
- $displaySub[0].=(exists $record{$version.':'.$matchKey[0]}) ?
- '<b>Part '.$partid.' '.
- ($record{"$version:resource.$partid.tries"} eq '' ? 'Trial not counted' :
- 'Trial '.$record{"$version:resource.$partid.tries"}).'</b> '.
- $record{$version.':'.$matchKey[0]}.'<br />' : '';
- $displaySub[1].=(exists $record{"$version:resource.$partid.award"}) ?
- '<b>Part '.$partid.'</b> '.
- $record{"$version:resource.$partid.award"}.'/'.
- $record{"$version:resource.$partid.solved"}.'<br />' : '';
- $displaySub[2].=(exists $record{"$version:resource.$partid.regrader"}) ?
- $record{"$version:resource.$partid.regrader"}.' (<b>Part:</b> '.$partid.')' : '';
- }
- $displaySub[2].=(exists $record{"$version:resource.regrader"}) ?
- $record{"$version:resource.regrader"} : '';
- $studentTable.='<td>'.$displaySub[0].' </td><td>'.$displaySub[1].
- ($displaySub[2] eq '' ? '' : 'Manually graded by '.$displaySub[2]).' </td></tr>';
+ my %responseType = ();
+ foreach my $partid (@{$parts}) {
+ $responseType{$partid} = $curRes->responseType($partid);
}
- $studentTable.='</table></td></tr></table>';
+ $studentTable.= &displaySubByDates(\$symbx,\%record,$parts,\%responseType,$checkIcon);
}
} elsif ($ENV{'form.lastSub'} eq 'all') {
my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
@@ -2860,7 +2937,7 @@ sub displayPage {
$navmap->untieHashes();
$studentTable.='</td></tr></table></td></tr></table>'."\n".
- ' <input type="button" value="Save" '.
+ '<input type="button" value="Save" '.
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
'</form>'."\n";
$studentTable.=&show_grading_menu_form($symb,$url);
@@ -2869,6 +2946,47 @@ sub displayPage {
return '';
}
+sub displaySubByDates {
+ my ($symbx,$record,$parts,$responseType,$checkIcon) = @_;
+ my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
+ '<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
+ '<td><b>Date/Time</b></td>'.
+ '<td><b>Submission</b></td>'.
+ '<td><b>Status </b></td></tr>';
+ my ($version);
+ my %mark;
+ $mark{'correct_by_student'} = $checkIcon;
+ return '<br /> <font color="red">Nothing submitted - no attempts</font><br />'
+ if (!exists($$record{'1:timestamp'}));
+ for ($version=1;$version<=$$record{'version'};$version++) {
+ my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
+ $studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
+ my @versionKeys = split(/\:/,$$record{$version.':keys'});
+ my @displaySub = ();
+ foreach my $partid (@{$parts}) {
+ my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
+# next if ($$record{"$version:resource.$partid.solved"} eq '');
+ $displaySub[0].=(exists $$record{$version.':'.$matchKey[0]}) ?
+ '<b>Part '.$partid.' '.
+ ($$record{"$version:resource.$partid.tries"} eq '' ? 'Trial not counted' :
+ 'Trial '.$$record{"$version:resource.$partid.tries"}).'</b> '.
+ &cleanRecord($$record{$version.':'.$matchKey[0]},$$responseType{$partid},$$symbx).'<br />' : '';
+ $displaySub[1].=(exists $$record{"$version:resource.$partid.award"}) ?
+ '<b>Part '.$partid.'</b> '.
+ lc($$record{"$version:resource.$partid.award"}).' '.
+ $mark{$$record{"$version:resource.$partid.solved"}}.'<br />' : '';
+ $displaySub[2].=(exists $$record{"$version:resource.$partid.regrader"}) ?
+ $$record{"$version:resource.$partid.regrader"}.' (<b>Part:</b> '.$partid.')' : '';
+ }
+ $displaySub[2].=(exists $$record{"$version:resource.regrader"}) ?
+ $$record{"$version:resource.regrader"} : ''; # needed because old essay regrader has not parts info
+ $studentTable.='<td>'.$displaySub[0].' </td><td>'.$displaySub[1].
+ ($displaySub[2] eq '' ? '' : 'Manually graded by '.$displaySub[2]).' </td></tr>';
+ }
+ $studentTable.='</table></td></tr></table>';
+ return $studentTable;
+}
+
sub updateGradeByPage {
my ($request) = shift;
@@ -2885,8 +3003,8 @@ sub updateGradeByPage {
return;
}
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>';
- $result.='<h3> Student: '.$$fullname{$ENV{'form.student'}}.
- '<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n";
+ $result.='<h3> Student: '.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).
+ '</h3>'."\n";
$request->print($result);
@@ -2900,7 +3018,7 @@ sub updateGradeByPage {
my $studentTable='<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.
- '<td align="center"><b> No </b></td>'.
+ '<td align="center"><b> Prob. </b></td>'.
'<td><b> Title </b></td>'.
'<td><b> Previous Score </b></td>'.
'<td><b> New Score </b></td></tr>';
@@ -2932,31 +3050,39 @@ sub updateGradeByPage {
my $score;
if ($partial > 0) {
$score = 'correct_by_override';
- } elsif ($partial == 0) {
+ } elsif ($newpts ne '') { #empty is taken as 0
$score = 'incorrect_by_override';
}
- if ($ENV{'form.GD_SEL'.$question.'_'.$partid} eq 'excused') {
+ my $dropMenu = $ENV{'form.GD_SEL'.$question.'_'.$partid};
+ if ($dropMenu eq 'excused') {
$partial = '';
$score = 'excused';
+ } elsif ($dropMenu eq 'reset status'
+ && $ENV{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists
+ $newrecord{'resource.'.$partid.'.tries'} = 0;
+ $newrecord{'resource.'.$partid.'.solved'} = '';
+ $newrecord{'resource.'.$partid.'.award'} = '';
+ $newrecord{'resource.'.$partid.'.awarded'} = 0;
+ $newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}";
+ $changeflag++;
+ $newpts = '';
}
+
my $oldstatus = $ENV{'form.solved'.$question.'_'.$partid};
$displayPts[0].=' <b>Part</b> '.$partid.' = '.
(($oldstatus eq 'excused') ? 'excused' : $oldpts).
' <br>';
$displayPts[1].=' <b>Part</b> '.$partid.' = '.
- ($oldstatus eq 'correct_by_student' ? $oldpts :
- (($score eq 'excused') ? 'excused' : $newpts)).
+ (($score eq 'excused') ? 'excused' : $newpts).
' <br>';
$question++;
- if (($oldstatus eq 'correct_by_student') ||
- ($newpts eq $oldpts && $score eq $oldstatus))
- {
- next;
- }
+ next if ($dropMenu eq 'reset status' || ($newpts == $oldpts && $score ne 'excused'));
+
$newrecord{'resource.'.$partid.'.awarded'} = $partial if $partial ne '';
- $newrecord{'resource.'.$partid.'.solved'} = $score;
- $newrecord{'resource.'.$partid.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $newrecord{'resource.'.$partid.'.solved'} = $score if $score ne '';
+ $newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}"
+ if (scalar(keys(%newrecord)) > 0);
$changeflag++;
}
@@ -2964,6 +3090,7 @@ sub updateGradeByPage {
&Apache::lonnet::cstore(\%newrecord,$symbx,$ENV{'request.course.id'},
$udom,$uname);
}
+
$studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
'<td valign="top">'.$displayPts[1].'</td>'.
'</tr>';
@@ -3019,6 +3146,8 @@ sub getSequenceDropDown {
}
sub scantron_uploads {
+ #FIXME need to support scantron files put in another location,
+ # maybe the course directory? a scantron dir in the course directory?
if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
my $result= '<select name="scantron_selectfile">';
opendir(DIR,$Apache::lonnet::perlvar{'lonScansDir'});
@@ -3055,9 +3184,11 @@ sub scantron_selectphase {
my $file_selector=&scantron_uploads();
my $format_selector=&scantron_scantab();
my $result;
+ #FIXME allow instructor to be able to download the scantron file
+ # and to upload it,
$result.= <<SCANTRONFORM;
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process">
- <input type="hidden" name="command" value="scantron_process" />
+ <input type="hidden" name="command" value="scantron_validate" />
$default_form_data
<table width="100%" border="0">
<tr>
@@ -3083,11 +3214,18 @@ sub scantron_selectphase {
Format of data file: $format_selector
</td>
</tr>
+ <tr bgcolor="#ffffe6">
+ <td>
+<!-- FIXME this is lazy, a single parse of the set should let me know what this is -->
+ Last line to expect an answer on:
+ <input type="text" name="scantron_maxbubble" />
+ </td>
+ </tr>
</table>
</td>
</tr>
</table>
- <input type="submit" value="Submit" />
+ <input type="submit" value="Validate Scantron Records" />
</form>
$grading_menu_button
SCANTRONFORM
@@ -3099,6 +3237,7 @@ sub get_scantron_config {
my ($which) = @_;
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
my %config;
+ #FIXME probably should move to XML it has already gotten a bit much now
foreach my $line (<$fh>) {
my ($name,$descrip)=split(/:/,$line);
if ($name ne $which ) { next; }
@@ -3115,6 +3254,12 @@ sub get_scantron_config {
$config{'Qlength'}=$config[8];
$config{'Qoff'}=$config[9];
$config{'Qon'}=$config[10];
+ $config{'PaperID'}=$config[11];
+ $config{'PaperIDlength'}=$config[12];
+ $config{'FirstName'}=$config[13];
+ $config{'FirstNamelength'}=$config[14];
+ $config{'LastName'}=$config[15];
+ $config{'LastNamelength'}=$config[16];
last;
}
return %config;
@@ -3130,8 +3275,50 @@ sub username_to_idmap {
return %idmap;
}
+sub scantron_fixup_scanline {
+ my ($scantron_config,$scan_data,$line,$whichline,$field,$newvalue,$arg)=@_;
+ if ($field eq 'ID') {
+ if ($newvalue > $$scantron_config{'IDlength'}) {
+ return ($line,1,'New value to large');
+ }
+ if ($newvalue < $$scantron_config{'IDlength'}) {
+ $newvalue=sprintf('%-'.$$scantron_config{'IDlength'}.'s',
+ $newvalue);
+ }
+ substr($line,$$scantron_config{'IDstart'}-1,
+ $$scantron_config{'IDlength'})=$newvalue;
+ } elsif ($field eq 'answer') {
+ my $length=$scantron_config->{'Qlength'};
+ my $off=$scantron_config->{'Qoff'};
+ my $on=$scantron_config->{'Qon'};
+ my $answer=${off}x$length;
+ if ($arg eq 'none') {
+ &scan_data($scan_data,"$whichline.no_bubble.$newvalue",'1');
+ } else {
+ substr($answer,$arg,1)=$on;
+ &scan_data($scan_data,"$whichline.no_bubble.$newvalue",undef,'1');
+ }
+ my $where=$length*($newvalue-1)+$scantron_config->{'Qstart'};
+ Apache->request->print("where $where arg $arg ");
+ Apache->request->print('b:<pre>'.$line.'</pre>');
+ substr($line,$where-1,$length)=$answer;
+ Apache->request->print('a:<pre>'.$line.'</pre>');
+ }
+ return $line;
+}
+
+sub scan_data {
+ my ($scan_data,$key,$value,$delete)=@_;
+ my $filename=$ENV{'form.scantron_selectfile'};
+ if (defined($value)) {
+ $scan_data->{$filename.'_'.$key} = $value;
+ }
+ if ($delete) { delete($scan_data->{$filename.'_'.$key}); }
+ return $scan_data->{$filename.'_'.$key};
+}
+
sub scantron_parse_scanline {
- my ($line,$scantron_config)=@_;
+ my ($line,$whichline,$scantron_config,$scan_data)=@_;
my %record;
my $questions=substr($line,$$scantron_config{'Qstart'}-1);
my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
@@ -3145,6 +3332,15 @@ sub scantron_parse_scanline {
}
$record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1,
$$scantron_config{'IDlength'});
+ $record{'scantron.PaperID'}=
+ substr($data,$$scantron_config{'PaperID'}-1,
+ $$scantron_config{'PaperIDlength'});
+ $record{'scantron.FirstName'}=
+ substr($data,$$scantron_config{'FirstName'}-1,
+ $$scantron_config{'FirstNamelength'});
+ $record{'scantron.LastName'}=
+ substr($data,$$scantron_config{'LastName'}-1,
+ $$scantron_config{'LastNamelength'});
my @alphabet=('A'..'Z');
my $questnum=0;
while ($questions) {
@@ -3152,31 +3348,48 @@ sub scantron_parse_scanline {
my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});
substr($questions,0,$$scantron_config{'Qlength'})='';
if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
- my (@array)=split(/$$scantron_config{'Qon'}/,$currentquest);
- if (scalar(@array) gt 2) {
- #FIXME do something intelligent with double bubbles
- Apache->request->print("<br ><b>Wha!!!</b> <pre>".scalar(@array).
- '-'.$currentquest.'-'.$questnum.'</pre><br />');
- }
+ my @array=split($$scantron_config{'Qon'},$currentquest,-1);
if (length($array[0]) eq $$scantron_config{'Qlength'}) {
$record{"scantron.$questnum.answer"}='';
+ if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+ push(@{$record{"scantron.missingerror"}},$questnum);
+ }
} else {
$record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];
}
+ if (scalar(@array) gt 2) {
+ push(@{$record{'scantron.doubleerror'}},$questnum);
+ my @ans=@array;
+ my $i=length($ans[0]);shift(@ans);
+ while (@ans) {
+ $i+=length($ans[0])+1;
+ $record{"scantron.$questnum.answer"}.=$alphabet[$i];
+ shift(@ans);
+ }
+ }
}
$record{'scantron.maxquest'}=$questnum;
return \%record;
}
sub scantron_add_delay {
+ my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;
+ Apache->request->print('add_delay_error '.$_[2] );
+ push(@$delayqueue,
+ {'line' => $scanline, 'emsg' => $errormessage,
+ 'ecode' => $errorcode }
+ );
}
sub scantron_find_student {
my ($scantron_record,$idmap)=@_;
my $scanID=$$scantron_record{'scantron.ID'};
foreach my $id (keys(%$idmap)) {
- Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>');
- if (lc($id) eq lc($scanID)) { Apache->request->print('success');return $$idmap{$id}; }
+ #Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>');
+ if (lc($id) eq lc($scanID)) {
+ #Apache->request->print('success');
+ return $$idmap{$id};
+ }
}
return undef;
}
@@ -3189,6 +3402,366 @@ sub scantron_filter {
return 0;
}
+#FIXME I think I am doing this in the wrong order, I think it would be
+#better to make a several passes analyzing all of the lines in the
+#file for common errors wrong/invalid PID/username duplicated
+#PID/username, missing bubbles, double bubbles, missing/invalid CODE
+#and then get the instructor to fix all of these errors, then grade
+#the corrected one, I'll still need to catch error conditions, but
+#maybe most will taken care even before we start
+
+sub scantron_process_corrections {
+ my ($r) = @_;
+ my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ my ($scanlines,$scan_data)=&scantron_getfile();
+ my $classlist=&Apache::loncoursedata::get_classlist();
+ my $which=$ENV{'form.scantron_line'};
+ my $line=&scantron_get_line($scanlines,$which);
+ my ($skip,$err,$errmsg);
+ if ($ENV{'form.scantron_skip_record'}) {
+ $skip=1;
+ } elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)ID$/) {
+ my $newstudent=$ENV{'form.scantron_username'}.':'.
+ $ENV{'form.scantron_domain'};
+ my $newid=$classlist->{$newstudent}->[&Apache::loncoursedata::CL_ID];
+ ($line,$err,$errmsg)=
+ &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,
+ 'ID',$newid);
+ } elsif ($ENV{'form.scantron_corrections'} =~ /^(missing|double)bubble$/) {
+ foreach my $question (split(',',$ENV{'form.scantron_questions'})) {
+ ($line,$err,$errmsg)=
+ &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,
+ $which,'answer',$question,
+ $ENV{"form.scantron_correct_Q_$question"});
+ if ($err) { last; }
+ }
+ }
+ if ($err) {
+ $r->print("Unable to accept last correction, an error occurred :$errmsg:");
+ } else {
+ &scantron_put_line($scanlines,$which,$line,$skip);
+ &scantron_putfile($scanlines,$scan_data);
+ }
+}
+
+
+sub scantron_validate_file {
+ my ($r) = @_;
+ my ($symb,$url)=&get_symb_and_url($r);
+ if (!$symb) {return '';}
+ my $default_form_data=&defaultFormData($symb,$url);
+
+ if ($ENV{'form.scantron_corrections'}) {
+ &scantron_process_corrections($r);
+ }
+ #get the student pick code ready
+ $r->print(&Apache::loncommon::studentbrowser_javascript());
+ my $result= <<SCANTRONFORM;
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
+ <input type="hidden" name="command" value="scantron_validate" />
+ <input type="hidden" name="selectpage" value="$ENV{'form.selectpage'}" />
+ <input type="hidden" name="scantron_format" value="$ENV{'form.scantron_format'}" />
+ <input type="hidden" name="scantron_selectfile" value="$ENV{'form.scantron_selectfile'}" />
+ <input type="hidden" name="scantron_maxbubble" value="$ENV{'form.scantron_maxbubble'}" />
+ $default_form_data
+SCANTRONFORM
+ $r->print($result);
+
+ my @validate_phases=( 'ID',
+ 'CODE',
+ 'doublebubble',
+ 'missingbubbles');
+ if (!$ENV{'form.validatepass'}) {
+ $ENV{'form.valiadatepass'} = 0;
+ }
+ my $currentphase=$ENV{'form.valiadatepass'};
+
+ if ($ENV{'form.scantron_selectfile'}=~m-^/-) {
+ #first pass copy file to classdir
+
+ }
+ my $stop=0;
+ while (!$stop && $currentphase < scalar(@validate_phases)) {
+ my $which="scantron_validate_".$validate_phases[$currentphase];
+ {
+ no strict 'refs';
+ ($stop,$currentphase)=&$which($r,$currentphase);
+ }
+ }
+ $r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
+ return '';
+}
+
+sub scantron_getfile {
+ #my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}");
+ #FIXME really would prefer a scantron directory but tokenwrapper
+ # doesn't allow access to subdirs of userfiles
+ my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $lines;
+ $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
+ 'scantron_orig_'.$ENV{'form.scantron_selectfile'});
+ if ($lines eq '-1') {
+ #FIXME need to actually replicate file to course space
+ }
+ my %scanlines;
+ $scanlines{'orig'}=[split("\n",$lines)];
+ my $temp=$scanlines{'orig'};
+ $scanlines{'count'}=$#$temp;
+
+ $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
+ 'scantron_corrected_'.$ENV{'form.scantron_selectfile'});
+ if ($lines eq '-1') {
+ $scanlines{'corrected'}=[];
+ } else {
+ $scanlines{'corrected'}=[split("\n",$lines)];
+ }
+ $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
+ 'scantron_skipped_'.$ENV{'form.scantron_selectfile'});
+ if ($lines eq '-1') {
+ $scanlines{'skipped'}=[];
+ } else {
+ $scanlines{'skipped'}=[split("\n",$lines)];
+ }
+ my @tmp=&Apache::lonnet::dump('scantrondata',$cdom,$cname);
+ if ($tmp[0] =~ /^(error:|no_such_host)/) { @tmp=(); }
+ my %scan_data = @tmp;
+ return (\%scanlines,\%scan_data);
+}
+
+sub lonnet_putfile {
+ my ($contents,$filename)=@_;
+ my $docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+ $ENV{'form.sillywaytopassafilearound'}=$contents;
+ &Apache::lonnet::finishuserfileupload($docuname,$docudom,$docuhome,'sillywaytopassafilearound',$filename);
+
+}
+
+sub scantron_putfile {
+ my ($scanlines,$scan_data) = @_;
+ #FIXME really would prefer a scantron directory but tokenwrapper
+ # doesn't allow access to subdirs of userfiles
+ my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $prefix='scantron_';
+# no need to update orig, shouldn't change
+# &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.
+# $ENV{'form.scantron_selectfile'});
+ &lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),
+ $prefix.'corrected_'.
+ $ENV{'form.scantron_selectfile'});
+ &lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
+ $prefix.'skipped_'.
+ $ENV{'form.scantron_selectfile'});
+ &Apache::lonnet::put('scantrondata',$scan_data,$cdom,$cname);
+}
+
+sub scantron_get_line {
+ my ($scanlines,$i)=@_;
+ if ($scanlines->{'skipped'}[$i]) {return undef;}
+ if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
+ return $scanlines->{'orig'}[$i];
+}
+
+sub scantron_put_line {
+ my ($scanlines,$i,$newline,$skip)=@_;
+ if ($skip) { $scanlines->{'skipped'}[$i]=$newline;return; }
+ $scanlines->{'corrected'}[$i]=$newline;
+}
+
+sub scantron_validate_ID {
+ my ($r,$currentphase) = @_;
+
+ #get student info
+ my $classlist=&Apache::loncoursedata::get_classlist();
+ my %idmap=&username_to_idmap($classlist);
+
+ #get scantron line setup
+ my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ my ($scanlines,$scan_data)=&scantron_getfile();
+
+ my %found=('ids'=>{},'usernames'=>{});
+ for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ my $line=&scantron_get_line($scanlines,$i);
+ if (!$line) { next; }
+ my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ $scan_data);
+ my $id=$$scan_record{'scantron.ID'};
+ $r->print("<p>Checking ID ".$$scan_record{'scantron.ID'}.
+ " on paper ID ".$$scan_record{'scantron.PaperID'}."</p>\n");
+ my $found;
+ foreach my $checkid (keys(%idmap)) {
+ if (lc($checkid) eq lc($id)) {
+ if ($checkid ne $id) {
+ $r->print("<p>Using $checkid for encoded $id</p>\n");
+ }
+ $found=$checkid;last;
+ }
+ }
+ if ($found) {
+ if ($found{'ids'}{$found}) {
+ #FIXME store away line we prviously saw the ID on
+ &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+ $line,'duplicateID',$found);
+ return(1);
+ } else {
+ $found{'ids'}{$found}++;
+ }
+ } else {
+ &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+ $line,'incorrectID');
+ return(1);
+ }
+ }
+
+ return (0,$currentphase+1);
+}
+
+sub scantron_get_correction {
+ my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
+
+#FIXME in the case of a duplicated ID the previous line, probaly need
+#to show both the current line and the previous one and allow skipping
+#the previous one or the current one
+
+ $r->print("<p>This scantron record has an error ($error). ");
+ if ( defined($$scan_record{'scantron.PaperID'}) ) {
+ $r->print("The current PaperID is <tt>".
+ $$scan_record{'scantron.PaperID'}."</tt> \n");
+ } else {
+ $r->print("The current scanline is <pre>".
+ $line."</pre> \n");
+ }
+ $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
+ $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
+ if ($error =~ /ID$/) {
+ if ($error eq 'unknownID') {
+ $r->print("The encoded ID is not in the classlist</p>\n");
+ } elsif ($error eq 'duplicateID') {
+ $r->print("The encoded ID has also been used by a previous paper $arg</p>\n");
+ }
+ $r->print("<p>Original ID is <tt>".$$scan_record{'scantron.ID'}.
+ "</tt><br />\n");
+ $r->print("Name on paper is ".$$scan_record{'scantron.LastName'}.",".
+ $$scan_record{'scantron.FirstName'}."</p>");
+ $r->print("<p>Please correct <br /> \n");
+ $r->print("\n<ul><li> Pick a specific user -- username:<input type='text' name='scantron_username' value='' />");
+ $r->print("\ndomain:".
+ &Apache::loncommon::select_dom_form(undef,'scantron_domain'));
+ #FIXME it would be nice if this sent back the user ID and
+ #could do partial userID matches
+ $r->print(&Apache::loncommon::selectstudent_link('scantronupload',
+ 'scantron_username','scantron_domain'));
+ $r->print('</li>');
+ } elsif ($error eq 'doublebubble') {
+ $r->print("There have been multiple bubbles scanned for a single question\n");
+ $r->print('<input type="hidden" name="scantron_questions" value="'.
+ join(',',@{$arg}).'" />');
+ foreach my $question (@{$arg}) {
+ my $selected=$$scan_record{"scantron.$question.answer"};
+ $r->print("<p> For question $question, selected bubbles were ".
+ join(" ",split('',$selected)).
+ " <br />Please pick which one should be used for grading<br />");
+ &scantron_bubble_selector($r,$scan_config,$question);
+ }
+ } elsif ($error eq 'missingbubble') {
+ $r->print("Some questions have no scanned bubbles\n");
+ $r->print('<input type="hidden" name="scantron_questions" value="'.
+ join(',',@{$arg}).'" />');
+ foreach my $question (@{$arg}) {
+ my $selected=$$scan_record{"scantron.$question.answer"};
+ $r->print("<p>Question $question, Please select a bubble to use ");
+ &scantron_bubble_selector($r,$scan_config,$question);
+ }
+ } else {
+ $r->print("\n<ul>");
+ }
+ $r->print("<li>Skip this scanline saving it for later ");
+ $r->print("\n<input type='checkbox' name='scantron_skip_record' /> </li></ul>");
+ &scantron_end_validate_form($r);
+}
+
+sub scantron_bubble_selector {
+ my ($r,$scan_config,$quest)=@_;
+ my $max=$$scan_config{'Qlength'};
+ my @alphabet=('A'..'Z');
+ for (my $i=0;$i<$max;$i++) {
+ $r->print('<input type="radio" name="scantron_correct_Q_'.$quest.
+ '" value="'.$i.'" />'.$alphabet[$i]);
+ }
+ $r->print('<input type="radio" name="scantron_correct_Q_'.$quest.
+ '" value="none" /> Nothing');
+ $r->print('<br />');
+}
+
+sub scantron_validate_CODE {
+ my ($r,$currentphase) = @_;
+ #FIXME doesn't do anything yet
+ return (0,$currentphase+1);
+}
+
+sub scantron_validate_doublebubble {
+ my ($r,$currentphase) = @_;
+ #get student info
+ my $classlist=&Apache::loncoursedata::get_classlist();
+ my %idmap=&username_to_idmap($classlist);
+
+ #get scantron line setup
+ my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ my ($scanlines,$scan_data)=&scantron_getfile();
+ for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ my $line=&scantron_get_line($scanlines,$i);
+ if (!$line) { next; }
+ my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ $scan_data);
+ if (!defined($$scan_record{'scantron.doubleerror'})) { next; }
+ &scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line,
+ 'doublebubble',
+ $$scan_record{'scantron.doubleerror'});
+ return (1,$currentphase);
+ }
+ return (0,$currentphase+1);
+}
+
+sub scantron_validate_missingbubbles {
+ my ($r,$currentphase) = @_;
+ #get student info
+ my $classlist=&Apache::loncoursedata::get_classlist();
+ my %idmap=&username_to_idmap($classlist);
+
+ #get scantron line setup
+ my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ my ($scanlines,$scan_data)=&scantron_getfile();
+ my $max_bubble=$ENV{'form.scantron_maxbubble'};
+ if (!$max_bubble) { $max_bubble=2**31; }
+ for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ my $line=&scantron_get_line($scanlines,$i);
+ if (!$line) { next; }
+ my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ $scan_data);
+ if (!defined($$scan_record{'scantron.missingerror'})) { next; }
+ my @to_correct;
+ foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
+ if ($missing gt $max_bubble) { next; }
+ push(@to_correct,$missing);
+ }
+ if (@to_correct) {
+ &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+ $line,'missingbubble',\@to_correct);
+ return (1,$currentphase);
+ }
+
+ }
+ return (0,$currentphase+1);
+}
+
+sub scantron_end_validate_form {
+ my ($r) = @_;
+ $r->print('<input type="submit" name="submit" /></form></body></html>');
+}
+
sub scantron_process_students {
my ($r) = @_;
my (undef,undef,$sequence)=split(/___/,$ENV{'form.selectpage'});
@@ -3197,14 +3770,13 @@ sub scantron_process_students {
my $default_form_data=&defaultFormData($symb,$url);
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
- my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}");
- my @scanlines=<$scanlines>;
+ my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&username_to_idmap($classlist);
my $navmap=Apache::lonnavmaps::navmap->new($ENV{'request.course.fn'}.'.db',$ENV{'request.course.fn'}.'_parms.db',1, 1);
my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
- $r->print("geto ".scalar(@resources)."<br />");
+# $r->print("geto ".scalar(@resources)."<br />");
my $result= <<SCANTRONFORM;
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
<input type="hidden" name="command" value="scantron_configphase" />
@@ -3213,29 +3785,39 @@ SCANTRONFORM
$r->print($result);
my @delayqueue;
- my $totalcorrect;
- my $totalincorrect;
-
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,
- 'Scantron Status','Scantron Progress',scalar(@scanlines));
- foreach my $line (@scanlines) {
- my $studentcorrect;
- my $studentincorrect;
-
- chomp($line);
- my $scan_record=&scantron_parse_scanline($line,\%scantron_config);
+ my %completedstudents;
+
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',
+ 'Scantron Progress',$scanlines->{'count'});
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+ 'Processing first student');
+ my $start=&Time::HiRes::time();
+ my $i=0;
+ while ($i<=$scanlines->{'count'}) {
+ $i++;
+ my $line=&scantron_get_line($scanlines,$i);
+ if (!$line) { next; }
+ $r->print('<pre>line is'.$line.'</pre>');
+ my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ $scan_data);
my ($uname,$udom);
- if ($uname=&scantron_find_student($scan_record,\%idmap)) {
+ unless ($uname=&scantron_find_student($scan_record,\%idmap)) {
+ &scantron_add_delay(\@delayqueue,$line,
+ 'Unable to find a student that matches',1);
+ next;
+ }
+ if (exists $completedstudents{$uname}) {
&scantron_add_delay(\@delayqueue,$line,
- 'Unable to find a student that matches');
+ 'Student '.$uname.' has multiple sheets',2);
+ next;
}
$r->print('<pre>doing studnet'.$uname.'</pre>');
($uname,$udom)=split(/:/,$uname);
&Apache::lonnet::delenv('form.counter');
&Apache::lonnet::appenv(%$scan_record);
# &Apache::lonhomework::showhash(%ENV);
- $Apache::lonxml::debug=1;
- &Apache::lonxml::debug("line is $line");
+# $Apache::lonxml::debug=1;
+# &Apache::lonxml::debug("line is $line");
my $i=0;
foreach my $resource (@resources) {
@@ -3247,31 +3829,31 @@ SCANTRONFORM
'grade_domain' =>$udom,
'grade_courseid'=>$ENV{'request.course.id'},
'grade_symb' =>$resource->symb()));
- my %score=&Apache::lonnet::restore($resource->symb(),
- $ENV{'request.course.id'},
- $udom,$uname);
- foreach my $part ($resource->{PARTS}) {
- if ($score{'resource.'.$part.'.solved'} =~ /^correct/) {
- $studentcorrect++;
- $totalcorrect++;
- } else {
- $studentincorrect++;
- $totalincorrect++;
- }
- }
- $r->print('<pre>'.
- $resource->symb().'-'.
- $resource->src().'-'.'</pre>result is'.$result);
- &Apache::lonhomework::showhash(%score);
+# my %score=&Apache::lonnet::restore($resource->symb(),
+# $ENV{'request.course.id'},
+# $udom,$uname);
+# foreach my $part ($resource->{PARTS}) {
+# if ($score{'resource.'.$part.'.solved'} =~ /^correct/) {
+# $studentcorrect++;
+# $totalcorrect++;
+# } else {
+# $studentincorrect++;
+# $totalincorrect++;
+# }
+# }
+# $r->print('<pre>'.
+# $resource->symb().'-'.
+# $resource->src().'-'.'</pre>result is'.$result);
+# &Apache::lonhomework::showhash(%score);
# if ($i eq 3) {last;}
}
+ $completedstudents{$uname}={'line'=>$line};
+ } continue {
&Apache::lonnet::delenv('form.counter');
&Apache::lonnet::delenv('scantron\.');
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 'last student Who got a '.$studentcorrect.' correct and '.
- $studentincorrect.' incorrect. The class has gotten '.
- $totalcorrect.' correct and '.$totalincorrect.' incorrect');
- last;
+ 'last student');
+ #last;
#FIXME
#get iterator for $sequence
#foreach question 'submit' the students answer to the server
@@ -3279,7 +3861,11 @@ SCANTRONFORM
# generate data to pass back that includes grade recevied
#}
}
- $Apache::lonxml::debug=0;
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ my $lasttime = &Time::HiRes::time()-$start;
+ $r->print("<p>took $lasttime</p>");
+
+ #$Apache::lonxml::debug=0;
foreach my $delay (@delayqueue) {
#FIXME
#print out each delayed student with interface to select how
@@ -3305,7 +3891,7 @@ SCANTRONFORM
#--- Show a Grading Menu button - Calls the next routine ---
sub show_grading_menu_form {
my ($symb,$url)=@_;
- my $result.='<form action="/adm/grades" method="post">'."\n".
+ my $result.='<br /><form action="/adm/grades" method="post">'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
@@ -3336,12 +3922,19 @@ sub gradingmenu {
$request->print(<<GRADINGMENUJS);
<script type="text/javascript" language="javascript">
- function checkChoice(formname) {
- var cmd = formname.command;
- formname.saveState.value = "saveCmd="+radioSelection(cmd)+":saveSec="+pullDownSelection(formname.section)+
+ function checkChoice(formname,val,cmdx) {
+ if (val <= 2) {
+ var cmd = radioSelection(formname.radioChoice);
+ var cmdsave = cmd;
+ } else {
+ cmd = cmdx;
+ cmdsave = 'submission';
+ }
+ formname.command.value = cmd;
+ formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
":saveSub="+radioSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
- if (cmd[0].checked || cmd[1].checked || cmd[2].checked || cmd[3].checked || cmd[4].checked) formname.submit();
- if (cmd[5].checked) {
+ if (val < 5) formname.submit();
+ if (val == 5) {
if (!checkReceiptNo(formname,'notOK')) { return false;}
formname.submit();
}
@@ -3358,119 +3951,39 @@ sub gradingmenu {
formname.receipt.focus();
return false;
}
- formname.command[5].checked = true;
return true;
}
-
- function radioSelection(radioButton) {
- var selection=null;
- if (radioButton.length > 1) {
- for (var i=0; i<radioButton.length; i++) {
- if (radioButton[i].checked) {
- return radioButton[i].value;
- }
- }
- } else {
- if (radioButton.checked) return radioButton.value;
- }
- return selection;
- }
-
- function pullDownSelection(selectOne) {
- var selection="";
- if (selectOne.length > 1) {
- for (var i=0; i<selectOne.length; i++) {
- if (selectOne[i].selected) {
- return selectOne[i].value;
- }
- }
- } else {
- if (selectOne.selected) return selectOne.value;
- }
- }
-
</script>
GRADINGMENUJS
-
- my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>'.
- '<table border="0">'.
- '<tr><td colspan=3><font size=+1><b>Problem: </b>'.$probTitle.'</font></td></tr>'."\n";
- my ($partlist,$handgrade) = &response_type($url);
- my ($resptype,$hdgrade)=('','no');
- for (sort keys(%$handgrade)) {
- my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
- $resptype = $responsetype;
- $hdgrade = $handgrade if ($handgrade eq 'yes');
- $result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
- '<td><b>Type: </b>'.$responsetype.'</td>'.
- '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
- }
- $result.='</table>'."\n";
-
+ &commonJSfunctions($request);
+ my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>';
+ my ($table,undef,$hdgrade) = &showResourceInfo($url,$probTitle);
+ $result.=$table;
my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();
- my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'pickStudentPage' : $$savedState{'saveCmd'});
+ my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
- my $saveSub = ($$savedState{'saveSub'} eq '' ? 'yes' : $$savedState{'saveSub'});
+ my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
- '<input type="hidden" name="response" value="'.$resptype.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".
+ '<input type="hidden" name="command" value="" />'."\n".
'<input type="hidden" name="saveState" value="" />'."\n".
+ '<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";
- $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n".
- '<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n".
+ $result.='<table width="100%" border=0><tr><td bgcolor=#777777>'."\n".
+ '<table width=100% border=0><tr bgcolor="#e6ffff"><td colspan="2">'."\n".
' <b>Select a Grading/Viewing Option</b></td></tr>'."\n".
- '<tr bgcolor=#ffffe6><td>'."\n";
-
- $result.='<table width=100% border=0>'.
- '<tr bgcolor="#ffffe6" valign="top"><td colspan="2">'.
- '<input type="radio" name="command" value="pickStudentPage" '.
- ($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
- 'Handgrade/View Submission for a student by page/sequence</td></tr>'."\n".
-
- '<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- '<input type="radio" name="command" value="viewgrades" '.
- ($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.
- 'Grade by section or class</td></tr>'."\n".
-
- '<tr bgcolor="#ffffe6"valign="top"><td><input type="radio" name="command" value="submission" '.
- ($saveCmd eq 'submission' ? 'checked' : '').'> '.
- ($hdgrade eq 'yes' ? 'View/Grade essay response of' : 'View').
- ' an individual student </td>'."\n".
- '<td>--> For students who has: '.
- '<input type="radio" name="submitonly" value="yes" '.
- ($saveSub eq 'yes' ? 'checked' : '').' /> submitted'.
- '<input type="radio" name="submitonly" value="all" '.
- ($saveSub eq 'all' ? 'checked' : '').' /> everybody</td></tr>'."\n".
-
- '<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- '<input type="radio" name="command" value="csvform" '.
- ($saveCmd eq 'csvform' ? 'checked' : '').'> '.
- 'Upload scores from file</td></tr>'."\n";
-
- $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- '<input type="radio" name="command" value="scantron_selectphase" '.
- ($saveCmd eq 'scantron_selectphase' ? 'checked="on"' : '').' /> '.
- 'Grade scantron forms</td></tr>'."\n";
-
- if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {
- $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
- '<input type="radio" name="command" value="verify" onChecked="javascript:this.form.receipt.focus()" '.
- ($saveCmd eq 'verify' ? 'checked' : '').'> '.
- 'Verify a submission receipt issued by this server</td>'.
- '<td>--> Receipt no: '.unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).
- '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.
- '</td></tr>'."\n";
- }
+ '<tr bgcolor="#ffffe6" valign="top"><td>'."\n";
- $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2"><br />'."\n".
- ' Select section: <select name="section">'."\n";
+ $result.='<table width="100%" border=0>';
+ $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
+ ' Select Section: <select name="section">'."\n";
if (ref($sections)) {
foreach (sort (@$sections)) {$result.='<option value="'.$_.'" '.
($saveSec eq $_ ? 'selected="on"' : '').'>'.$_.'</option>'."\n";}
@@ -3478,7 +3991,6 @@ GRADINGMENUJS
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> ';
$result.='Student Status:</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
- $result.=' <font color="red">(Applies to the first three options only.)</font>'."\n";
if (ref($sections)) {
$result.=' (Section "no" implies the students were not assigned a section.)<br />'
@@ -3486,9 +3998,49 @@ GRADINGMENUJS
}
$result.='</td></tr>';
- $result.='<tr bgcolor="#ffffe6"><td colspan="2"><br />'.
- '<input type="button" onClick="javascript:checkChoice(this.form);" value="View/Grade" />'."\n".
- '</form></td></tr></table>'."\n".
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+ '<input type="radio" name="radioChoice" value="submission" '.
+ ($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>Current Resource:</b> For one or more students'.
+ '<br /> -->For students with '.
+ '<input type="radio" name="submitonly" value="yes" '.
+ ($saveSub eq 'yes' ? 'checked' : '').' /> submissions or '.
+ '<input type="radio" name="submitonly" value="all" '.
+ ($saveSub eq 'all' ? 'checked' : '').' /> for all</td></tr>'."\n";
+
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+ '<input type="radio" name="radioChoice" value="viewgrades" '.
+ ($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.
+ '<b>Current Resource:</b> For all students in selected section or course</td></tr>'."\n";
+
+ $result.='<tr bgcolor="#ffffe6" valign="top"><td>'.
+ '<input type="radio" name="radioChoice" value="pickStudentPage" '.
+ ($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
+ 'The <b>complete</b> set/page/sequence: For one student</td></tr>'."\n";
+
+ $result.='<tr bgcolor="#ffffe6"><td><br />'.
+ '<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
+ '</td></tr></table>'."\n";
+
+ $result.='</td><td valign="top">';
+
+ $result.='<table width="100%" border=0>';
+ $result.='<tr bgcolor="#ffffe6"><td>'.
+ '<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="Upload" />'.
+ ' scores from file </td></tr>'."\n";
+
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+ '<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
+ '" value="Grade" /> scantron forms</td></tr>'."\n";
+
+ if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+ '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="Verify" />'.
+ ' submission Receipt no: '.unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).
+ '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.
+ '</td></tr>'."\n";
+ }
+
+ $result.='</form></td></tr></table>'."\n".
'</td></tr></table>'."\n".
'</td></tr></table>'."\n";
return $result;
@@ -3596,6 +4148,8 @@ sub handler {
}
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
$request->print(&scantron_selectphase($request));
+ } elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
+ $request->print(&scantron_validate_file($request));
} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
$request->print(&scantron_process_students($request));
} elsif ($command) {
@@ -3615,6 +4169,7 @@ sub send_header {
#remotewindow.close();
#</script>");
$request->print(&Apache::loncommon::bodytag('Grading'));
+ $request->rflush();
}
sub send_footer {