--- loncom/homework/grades.pm 2003/07/18 20:14:35 1.119
+++ loncom/homework/grades.pm 2003/07/31 15:08:41 1.129
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.119 2003/07/18 20:14:35 ng Exp $
+# $Id: grades.pm,v 1.129 2003/07/31 15:08:41 ng 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);
@@ -107,7 +121,8 @@ sub response_type {
my ($responsetype,$part) = split(/_/,$_,2);
my ($partid,$respid) = split(/_/,$part);
$responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
- $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
+ 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;
@@ -123,23 +138,25 @@ sub showResourceInfo {
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,$hdgrade)=('','no');
+ my %resptype = ();
+ my $hdgrade='no';
for (sort keys(%$handgrade)) {
my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
- $resptype = $responsetype;
+ my $partID = (split(/_/))[0];
+ $resptype{$partID} = $responsetype;
$hdgrade = $handgrade if ($handgrade eq 'yes');
- $result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
+ $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;
+ return $result,\%resptype,$hdgrade,$partlist,$handgrade;
}
#--- Clean response type for display
#--- Currently filters option response type only.
sub cleanRecord {
- my ($answer,$response) = @_;
+ my ($answer,$response,$symb) = @_;
if ($response eq 'option') {
my (@IDs,@ans);
foreach (split(/\&/,&Apache::lonnet::unescape($answer))) {
@@ -148,12 +165,27 @@ sub cleanRecord {
push @ans,$ans;
}
my $grayFont = '<font color="#999999">';
- return '<table border="1">'.
+ 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>';
+ '</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;
}
@@ -197,6 +229,7 @@ COMMONJSFUNCTIONS
#--- 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));
@@ -277,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";
@@ -303,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".
@@ -430,7 +464,7 @@ sub listStudents {
my $result='<h3><font color="#339933"> '.$viewgrade.
' Submissions for a Student or a Group of Students</font></h3>';
- my ($table,$resptype,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
+ my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
$result.=$table;
$request->print(<<LISTJAVASCRIPT);
@@ -452,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();
@@ -485,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".
@@ -497,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";
@@ -547,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)) {
@@ -558,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>';
@@ -574,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) {
@@ -623,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;
@@ -647,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;
}
}
@@ -659,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) {
@@ -678,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;
}
@@ -689,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;
}
@@ -707,34 +744,35 @@ sub sub_page_js {
}
function checkSolved(formname,id) {
- if (eval("formname.solved"+id+".value") == "correct_by_student") {
+ 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;
}
}
@@ -744,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();
}
@@ -752,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++;
@@ -797,14 +841,14 @@ sub sub_page_kw_js {
<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;
}
@@ -830,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;
@@ -850,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" }
@@ -873,6 +918,22 @@ sub sub_page_kw_js {
return;
}
+ 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";
@@ -880,7 +941,6 @@ sub sub_page_kw_js {
height = 600;
scrollbar = "yes";
}
-// if (window.pWin) {window.pWin.close(); window.pWin=null}
var xpos = (screen.width-600)/2;
xpos = (xpos < 0) ? '0' : xpos;
var ypos = (screen.height-height)/2-30;
@@ -889,16 +949,17 @@ sub sub_page_kw_js {
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) {");
@@ -906,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;");
@@ -919,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()");
@@ -973,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 ==============
@@ -1016,6 +1080,7 @@ sub sub_page_kw_js {
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>");
@@ -1064,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>
@@ -1113,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".
@@ -1160,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 '';
@@ -1173,7 +1241,10 @@ sub submission {
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) {
@@ -1186,8 +1257,6 @@ sub submission {
'<font size=+1> <b>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
if ($ENV{'form.handgrade'} eq 'no') {
- my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
- '/check.gif" height="16" border="0" />';
my $checkMark='<br /><br /> <b>Note:</b> Part(s) graded correct by the computer is marked with a '.
$checkIcon.' symbol.'."\n";
$request->print($checkMark);
@@ -1215,15 +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".
@@ -1231,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);
@@ -1259,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 />
@@ -1279,18 +1354,16 @@ 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.
- ($ENV{'user.domain'} eq $udom ? '' : ' ('.$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";
@@ -1379,7 +1452,8 @@ KEYWORDS
if (!exists($record{'resource.'.$partid.'.'.$respid.'.submission'})) {
$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
$partid.'</b> <font color="#999999">( ID '.$respid.
- ' )</font> Nothing submitted<br /><br />';
+ ' )</font> '.
+ '<font color="red">Nothing submitted - no attempts</font><br /><br />';
} else {
foreach (@$string) {
my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
@@ -1404,11 +1478,9 @@ KEYWORDS
'"><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>'.($responsetype =~ /^(essay|option)$/ ?
- '<blockquote>' : '').
- &cleanRecord(&keywords_highlight($subval),$responsetype).
- ($responsetype =~ /^(essay|option)$/ ? '</blockquote><br />' :
- '<br /><br />').$similar."\n"
+ '<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$/));
@@ -1420,27 +1492,33 @@ KEYWORDS
$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;
}
- $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";
- # essay grading options
+ # essay grading message center
if ($ENV{'form.handgrade'} eq 'yes') {
my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
my $msgfor = $givenn.' '.$lastname;
@@ -1449,7 +1527,8 @@ KEYWORDS
$msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
}
$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
-# $result.='<tr><td bgcolor="#ffffff">'."\n".
+ $result='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
+ '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.
',\''.$msgfor.'\')"; TARGET=_self>'.
'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> '.
@@ -1457,22 +1536,26 @@ KEYWORDS
'/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);
}
- $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$/ && $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="'.
@@ -1483,8 +1566,7 @@ KEYWORDS
# print end of form
if ($counter == $total) {
- my $endform='<table border="0"><tr><td>'.
- '<input type="hidden" name="gradeOpt" value="" />'."\n";
+ 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";
@@ -1495,11 +1577,11 @@ KEYWORDS
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="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" ;
+ $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);
@@ -1529,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;
}
@@ -1554,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) {
@@ -1648,7 +1729,6 @@ sub processHandGrade {
$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);
@@ -1668,6 +1748,16 @@ 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)};
@@ -1691,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++;
}
@@ -1740,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.'_'.$_});
@@ -1768,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'}";
}
}
@@ -1790,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;
@@ -1824,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) {
@@ -1840,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;
@@ -1856,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;
}
}
@@ -1887,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));
@@ -1909,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;
@@ -1930,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 {
@@ -1973,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">';
@@ -2023,7 +2117,8 @@ 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".
@@ -2033,21 +2128,14 @@ sub viewgrades {
#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');
- next if ($display =~ /Number of Attempts/);
+ $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);
@@ -2068,13 +2156,13 @@ 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);
@@ -2087,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";
@@ -2111,21 +2199,20 @@ 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";
-# } else {
-# $result.='<input type="hidden" name="'.
-# 'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
-# "\n";
-# $result.='<td align="middle"><input type="text" name="'.
-# 'GD_'.$student.'_'.$part.'_'.$type.'" '.
-# 'value="'.$score.'" size="4" /></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.'" />'.
+ "\n";
+ $result.='<td align="middle"><input type="text" name="'.
+ 'GD_'.$student.'_'.$part.'_'.$type.'" '.
+ 'value="'.$score.'" size="4" /></td>'."\n";
}
}
$result.='</tr>';
@@ -2142,9 +2229,11 @@ sub editgrades {
my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
$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',
@@ -2178,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;
}
}
@@ -2193,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};
@@ -2201,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;
}
@@ -2227,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>';
@@ -2249,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>'.
@@ -2261,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;
@@ -2378,7 +2481,7 @@ sub csvuploadmap_header {
$javascript=&csvupload_javascript_forward_associate();
}
- my ($result,$resptype,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
+ my ($result) = &showResourceInfo($url,$ENV{'form.probTitle'});
$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
@@ -2590,7 +2693,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 {
@@ -2604,9 +2707,9 @@ 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();
}
@@ -2649,7 +2752,7 @@ LISTJAVASCRIPT
$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".
@@ -2660,34 +2763,33 @@ LISTJAVASCRIPT
'<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);
@@ -2739,9 +2841,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);
@@ -2755,11 +2856,13 @@ 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').
@@ -2779,7 +2882,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();
@@ -2801,6 +2904,7 @@ sub displayPage {
}
my %record = &Apache::lonnet::restore($symbx,$ENV{'request.course.id'},$udom,$uname);
+
if ($ENV{'form.lastSub'} eq 'datesub') {
if ($record{'version'} eq '') {
$studentTable.='<br /> <font color="red">No recorded submission for this problem</font><br />';
@@ -2809,7 +2913,7 @@ sub displayPage {
foreach my $partid (@{$parts}) {
$responseType{$partid} = $curRes->responseType($partid);
}
- $studentTable.= &displaySubByDates(\%record,$parts,\%responseType,$checkIcon);
+ $studentTable.= &displaySubByDates(\$symbx,\%record,$parts,\%responseType,$checkIcon);
}
} elsif ($ENV{'form.lastSub'} eq 'all') {
my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
@@ -2834,7 +2938,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);
@@ -2844,7 +2948,7 @@ sub displayPage {
}
sub displaySubByDates {
- my ($record,$parts,$responseType,$checkIcon) = @_;
+ 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>'.
@@ -2853,6 +2957,8 @@ sub displaySubByDates {
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>';
@@ -2860,22 +2966,21 @@ sub displaySubByDates {
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.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}).'<br />' : '';
+ &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 />' : '';
-# $$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"} : '';
+ $$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>';
}
@@ -2899,8 +3004,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);
@@ -2914,7 +3019,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>';
@@ -2946,31 +3051,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++;
}
@@ -2978,6 +3091,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>';
@@ -3319,7 +3433,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".
@@ -3385,7 +3499,7 @@ sub gradingmenu {
GRADINGMENUJS
&commonJSfunctions($request);
my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>';
- my ($table,$resptype,$hdgrade) = &showResourceInfo($url,$probTitle);
+ my ($table,undef,$hdgrade) = &showResourceInfo($url,$probTitle);
$result.=$table;
my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();
@@ -3397,11 +3511,11 @@ GRADINGMENUJS
$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".
@@ -3446,7 +3560,7 @@ GRADINGMENUJS
'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="View/Grade/Regrade" />'.
+ '<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
'</td></tr></table>'."\n";
$result.='</td><td valign="top">';