--- loncom/homework/grades.pm 2003/03/11 19:32:02 1.71
+++ loncom/homework/grades.pm 2003/03/27 21:26:07 1.78
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.71 2003/03/11 19:32:02 ng Exp $
+# $Id: grades.pm,v 1.78 2003/03/27 21:26:07 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -113,7 +113,7 @@ sub response_type {
#--- Dumps the class list with usernames,list of sections,
#--- section, ids and fullnames for each user.
sub getclasslist {
- my ($getsec,$hideexpired) = @_;
+ my ($getsec,$filterlist) = @_;
my $classlist=&Apache::loncoursedata::get_classlist();
# Bail out if we were unable to get the classlist
return if (! defined($classlist));
@@ -124,11 +124,13 @@ sub getclasslist {
# the following undefs are for 'domain', and 'username' respectively.
my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
@{$classlist->{$_}};
- # still a student?
- if (($hideexpired) && ($status ne 'Active')) {
- delete ($classlist->{$_});
- next;
- }
+ # filter students according to status selected
+ if ($filterlist && $ENV{'form.status'} ne 'Any') {
+ if ($ENV{'form.status'} ne $status) {
+ delete ($classlist->{$_});
+ next;
+ }
+ }
$section = ($section ne '' ? $section : 'no');
if ($getsec eq 'all' || $getsec eq $section) {
$sections{$section}++;
@@ -209,6 +211,8 @@ sub jscriptNform {
$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\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".
+ '<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="command" value="submission" />'."\n".
'<input type="hidden" name="student" value="" />'."\n".
'<input type="hidden" name="userdom" value="" />'."\n".
@@ -237,8 +241,7 @@ sub verifyreceipt {
my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
$receipt.'</h3></font>'."\n".
- '<font size=+1><b>Problem: </b>'.
- &Apache::lonnet::metadata($ENV{'form.url'},'title').'</font><br><br>'."\n";
+ '<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font><br><br>'."\n";
my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');
@@ -273,10 +276,6 @@ sub verifyreceipt {
return $string.&show_grading_menu_form($symb,$url);
}
-#
-# Pick student and page/sequence for manual grading
-
-
#--- This is called by a number of programs.
#--- Called from the Grading Menu - View/Grade an individual student
#--- Also called directly when one clicks on the subm button
@@ -284,7 +283,7 @@ sub verifyreceipt {
sub listStudents {
my ($request) = shift;
- my ($symb,$url) = &get_symb_and_url();
+ 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"};
my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
@@ -299,15 +298,17 @@ sub listStudents {
'<td><b>Type: </b>'.$responsetype.'</td>'.
'<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
}
- $result.='</table>';
+ $result.='</table>'."\n";
my $viewgrade = $ENV{'form.handgrade'} eq 'yes' ? 'View/Grade' : '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>'.&Apache::lonnet::metadata($url,'title').'</font></td></tr>'.$result;
+ '<table border="0"><tr><td colspan=3><font size=+1>'.
+ '<b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>'.$result;
$request->print(<<LISTJAVASCRIPT);
<script type="text/javascript" language="javascript">
@@ -357,6 +358,8 @@ LISTJAVASCRIPT
'<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".
+ '<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'To '.lc($viewgrade).' a submission, click on the check box next to the student\'s name. Then '."\n".
@@ -367,7 +370,7 @@ LISTJAVASCRIPT
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
'value="'.$viewgrade.'" />'."\n";
- my (undef,undef,$fullname) = &getclasslist($getsec,'0');
+ my (undef,undef,$fullname) = &getclasslist($getsec,$ENV{'form.showgrading'} eq 'yes' ? '1' : '0');
$gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.
@@ -459,7 +462,8 @@ sub sub_page_js {
function updateRadio(formname,id,weight) {
var gradeBox = eval("formname.GD_BOX"+id);
var radioButton = eval("formname.RADVAL"+id);
- var pts = checkSolved(formname,id) == 'update' ? gradeBox.value : weight;
+ var oldpts = eval("formname.oldpts"+id+".value");
+ var pts = checkSolved(formname,id) == 'update' ? gradeBox.value : oldpts;
gradeBox.value = pts;
var resetbox = false;
if (isNaN(pts) || pts < 0) {
@@ -496,16 +500,17 @@ sub sub_page_js {
stores.value = "0";
}
- function writeBox(formname,id,pts,weight) {
+ function writeBox(formname,id,pts) {
var gradeBox = eval("formname.GD_BOX"+id);
if (checkSolved(formname,id) == 'update') {
gradeBox.value = pts;
} else {
- gradeBox.value = weight;
+ var oldpts = eval("formname.oldpts"+id+".value");
+ gradeBox.value = oldpts;
var radioButton = eval("formname.RADVAL"+id);
for (var i=0; i<radioButton.length; i++) {
radioButton[i].checked=false;
- if (i == weight) {
+ if (i == oldpts) {
radioButton[i].checked=true;
}
}
@@ -628,8 +633,7 @@ sub sub_page_kw_js {
//===================== Show list of keywords ====================
function keywords(keyform) {
- var keywds = keyform.value;
- var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keywds);
+ var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keyform.value);
if (nret==null) return;
keyform.value = nret;
@@ -698,91 +702,97 @@ sub sub_page_kw_js {
return;
}
+// var pWin = null;
function savedMsgHeader(Nmsg,usrctr,fullname) {
- var height = 30*Nmsg+250;
+ var height = 70*Nmsg+250;
var scrollbar = "no";
if (height > 600) {
height = 600;
scrollbar = "yes";
}
-/* if (window.pWin)
- window.pWin.close(); */
+// if (window.pWin) window.pWin.close();
pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx=70,screeny=75,width=600,height='+height);
- pWin.document.write("<html><head>");
- pWin.document.write("<title>Message Central</title>");
-
- pWin.document.write("<script language=javascript>");
- pWin.document.write("function checkInput() {");
- pWin.document.write(" opener.document.SCORE.msgsub.value = document.msgcenter.msgsub.value;");
- pWin.document.write(" var nmsg = opener.document.SCORE.savemsgN.value;");
- pWin.document.write(" var usrctr = document.msgcenter.usrctr.value;");
- pWin.document.write(" var newval = eval(\\"opener.document.SCORE.newmsg\\"+usrctr);");
- pWin.document.write(" newval.value = document.msgcenter.newmsg.value;");
-
- pWin.document.write(" var msgchk = \\"\\";");
- pWin.document.write(" if (document.msgcenter.subchk.checked) {");
- pWin.document.write(" msgchk = \\"msgsub,\\";");
- pWin.document.write(" }");
- pWin.document.write( "for (var i=1; i<=nmsg; i++) {");
- pWin.document.write(" var opnmsg = eval(\\"opener.document.SCORE.savemsg\\"+i);");
- pWin.document.write(" var frmmsg = eval(\\"document.msgcenter.msg\\"+i);");
- pWin.document.write(" opnmsg.value = frmmsg.value;");
- pWin.document.write(" var chkbox = eval(\\"document.msgcenter.msgn\\"+i);");
- pWin.document.write(" if (chkbox.checked) {");
- pWin.document.write(" msgchk += \\"savemsg\\"+i+\\",\\";");
- pWin.document.write(" }");
- pWin.document.write(" }");
- pWin.document.write(" if (document.msgcenter.newmsgchk.checked) {");
- pWin.document.write(" msgchk += \\"newmsg\\"+usrctr;");
- pWin.document.write(" }");
- pWin.document.write(" var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
- pWin.document.write(" includemsg.value = msgchk;");
-
- pWin.document.write(" self.close()");
-
- pWin.document.write("}");
-
- pWin.document.write("<");
- pWin.document.write("/script>");
-
- pWin.document.write("</head><body bgcolor=white>");
-
- pWin.document.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
- pWin.document.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
- pWin.document.write("<font color=\\"green\\" size=+1> Compose Message for \"+fullname+\"</font><br><br>");
-
- pWin.document.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
- pWin.document.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
- pWin.document.write("<td><b>Type</b></td><td><b>Include</b></td><td><b>Message</td></tr>");
+ pWin.focus();
+ pDoc = pWin.document;
+ 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(" 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 msgchk = \\"\\";");
+ pDoc.write(" if (document.msgcenter.subchk.checked) {");
+ pDoc.write(" msgchk = \\"msgsub,\\";");
+ pDoc.write(" }");
+ 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(" if (chkbox.checked) {");
+ pDoc.write(" msgchk += \\"savemsg\\"+i+\\",\\";");
+ pDoc.write(" }");
+ pDoc.write(" }");
+ pDoc.write(" if (document.msgcenter.newmsgchk.checked) {");
+ pDoc.write(" msgchk += \\"newmsg\\"+usrctr;");
+ pDoc.write(" }");
+ pDoc.write(" var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
+ pDoc.write(" includemsg.value = msgchk;");
+
+ pDoc.write(" self.close()");
+
+ pDoc.write("}");
+
+ pDoc.write("<");
+ pDoc.write("/script>");
+
+ pDoc.write("</head><body bgcolor=white>");
+
+ pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
+ pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
+ pDoc.write("<font color=\\"green\\" size=+1> Compose Message for \"+fullname+\"</font><br><br>");
+
+ pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+ pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+ pDoc.write("<td><b>Type</b></td><td><b>Include</b></td><td><b>Message</td></tr>");
}
function displaySubject(msg,shwsel) {
- pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
- pWin.document.write("<td>Subject</td>");
- pWin.document.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
- pWin.document.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+ pDoc = pWin.document;
+ pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
+ pDoc.write("<td>Subject</td>");
+ pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
+ pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");
}
-function displaySavedMsg(ctr,msg,shwsel) {
- pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
- pWin.document.write("<td align=\\"center\\">"+ctr+"</td>");
- pWin.document.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"></td>");
- pWin.document.write("<td><input name=\\"msg"+ctr+"\\" type=\\"text\\" value=\\""+msg+"\\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+ function displaySavedMsg(ctr,msg,shwsel) {
+ pDoc = pWin.document;
+ pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
+ pDoc.write("<td align=\\"center\\">"+ctr+"</td>");
+ pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"></td>");
+ pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"</textarea></td></tr>");
}
function newMsg(newmsg,shwsel) {
- pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
- pWin.document.write("<td align=\\"center\\">New</td>");
- pWin.document.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
- pWin.document.write("<td><input name=\\"newmsg\\" type=\\"text\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" value=\\""+newmsg+"\\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+ pDoc = pWin.document;
+ pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
+ pDoc.write("<td align=\\"center\\">New</td>");
+ pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
+ pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"</textarea></td></tr>");
}
function msgTail() {
- pWin.document.write("</table>");
- pWin.document.write("</td></tr></table> ");
- pWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\"> ");
- pWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
- pWin.document.write("</form>");
- pWin.document.write("</body></html>");
+ pDoc = pWin.document;
+ pDoc.write("</table>");
+ pDoc.write("</td></tr></table> ");
+ pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\"> ");
+ pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+ pDoc.write("</form>");
+ pDoc.write("</body></html>");
}
//====================== Script for keyword highlight options ==============
@@ -816,66 +826,70 @@ function displaySavedMsg(ctr,msg,shwsel)
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');
- hwdWin.document.write("<html><head>");
- hwdWin.document.write("<title>Highlight Central</title>");
-
- hwdWin.document.write("<script language=javascript>");
- hwdWin.document.write("function updateChoice(flag) {");
- hwdWin.document.write(" opener.document.SCORE.kwclr.value = radioSelection(document.hlCenter.kwdclr);");
- hwdWin.document.write(" opener.document.SCORE.kwsize.value = radioSelection(document.hlCenter.kwdsize);");
- hwdWin.document.write(" opener.document.SCORE.kwstyle.value = radioSelection(document.hlCenter.kwdstyle);");
- hwdWin.document.write(" opener.document.SCORE.refresh.value = \\"on\\";");
- hwdWin.document.write(" if (opener.document.SCORE.keywords.value!=\\"\\"){");
- hwdWin.document.write(" opener.document.SCORE.submit();");
- hwdWin.document.write(" }");
- hwdWin.document.write(" self.close()");
- hwdWin.document.write("}");
-
- hwdWin.document.write("function radioSelection(radioButton) {");
- hwdWin.document.write(" var selection=null;");
- hwdWin.document.write(" for (var i=0; i<radioButton.length; i++) {");
- hwdWin.document.write(" if (radioButton[i].checked) {");
- hwdWin.document.write(" selection=radioButton[i].value;");
- hwdWin.document.write(" return selection;");
- hwdWin.document.write(" }");
- hwdWin.document.write(" }");
- hwdWin.document.write("}");
-
- hwdWin.document.write("<");
- hwdWin.document.write("/script>");
-
- hwdWin.document.write("</head><body bgcolor=white>");
-
- hwdWin.document.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
- hwdWin.document.write("<font color=\\"green\\" size=+1> Keyword Highlight Options</font><br><br>");
-
- hwdWin.document.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
- hwdWin.document.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
- hwdWin.document.write("<td><b>Text Color</b></td><td><b>Font Size</b></td><td><b>Font Style</td></tr>");
+ hwdWin.focus();
+ var hDoc = hwdWin.document;
+ 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.refresh.value = \\"on\\";");
+ hDoc.write(" if (opener.document.SCORE.keywords.value!=\\"\\"){");
+ hDoc.write(" opener.document.SCORE.submit();");
+ hDoc.write(" }");
+ 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>");
+
+ hDoc.write("</head><body bgcolor=white>");
+
+ hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
+ hDoc.write("<font color=\\"green\\" size=+1> Keyword Highlight Options</font><br><br>");
+
+ hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+ hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+ hDoc.write("<td><b>Text Color</b></td><td><b>Font Size</b></td><td><b>Font Style</td></tr>");
}
function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) {
- hwdWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
- hwdWin.document.write("<td align=\\"left\\">");
- hwdWin.document.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+"> "+clrtxt+"</td>");
- hwdWin.document.write("<td align=\\"left\\">");
- hwdWin.document.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+"> "+sztxt+"</td>");
- hwdWin.document.write("<td align=\\"left\\">");
- hwdWin.document.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+"> "+sytxt+"</td>");
- hwdWin.document.write("</tr>");
+ var hDoc = hwdWin.document;
+ hDoc.write("<tr bgcolor=\\"#ffffdd\\">");
+ hDoc.write("<td align=\\"left\\">");
+ hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+"> "+clrtxt+"</td>");
+ hDoc.write("<td align=\\"left\\">");
+ hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+"> "+sztxt+"</td>");
+ hDoc.write("<td align=\\"left\\">");
+ hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+"> "+sytxt+"</td>");
+ hDoc.write("</tr>");
}
function highlightend() {
- hwdWin.document.write("</table>");
- hwdWin.document.write("</td></tr></table> ");
-// hwdWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(0)\\"> ");
- hwdWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\"> ");
- hwdWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
- hwdWin.document.write("</form>");
- hwdWin.document.write("</body></html>");
+ var hDoc = hwdWin.document;
+ hDoc.write("</table>");
+ hDoc.write("</td></tr></table> ");
+ hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\"> ");
+ hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+ hDoc.write("</form>");
+ hDoc.write("</body></html>");
}
</script>
@@ -905,7 +919,7 @@ sub gradeBox {
while ($ctr<=$wgt) {
$result.= '<td><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
- $ctr.','.$wgt.')" value="'.$ctr.'" '.
+ $ctr.')" value="'.$ctr.'" '.
($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
$ctr++;
@@ -964,7 +978,6 @@ sub show_problem {
$result.='</td></tr></table>';
$result.='</td></tr></table><br />';
return $result;
-# $request->print($result);
}
# --------------------------- show submissions of a student, option to grade
@@ -972,24 +985,23 @@ sub submission {
my ($request,$counter,$total) = @_;
(my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-# if ($ENV{'form.student'} eq '') { &moreinfo($request,'Need student login id'); return ''; }
my ($uname,$udom) = ($ENV{'form.student'},$ENV{'form.userdom'});
($uname,$udom) = &finduser($uname) if $udom eq '';
$ENV{'form.fullname'} = &get_fullname ($uname,$udom) if $ENV{'form.fullname'} eq '';
-# if ($uname eq '') { &moreinfo($request,'Unable to find student'); return ''; }
my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
-# $ENV{'form.vProb'} = $ENV{'form.vProb'} ne '' ? $ENV{'form.vProb'} : 'yes';
# header info
if ($counter == 0) {
&sub_page_js($request);
&sub_page_kw_js($request);
+ $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>'.
- &Apache::lonnet::metadata($url,'title').'</font>'."\n");
+ '<font size=+1> <b>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
# option to display problem, only once else it cause problems
# with the form later since the problem has a form.
@@ -1011,13 +1023,15 @@ sub submission {
$ENV{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
$ENV{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
$ENV{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?
- $keyhash{$symb.'_subject'} : &Apache::lonnet::metadata($url,'title');
+ $keyhash{$symb.'_subject'} : $ENV{'form.probTitle'};
$ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
}
$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="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="refresh" value="off" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
@@ -1081,7 +1095,7 @@ KEYWORDS
my ($classlist,$fullname);
if ($ENV{'form.handgrade'} eq 'yes') {
my @col_list;
- ($classlist,undef,$fullname) = &getclasslist('all','0');
+ ($classlist,undef,$fullname) = &getclasslist('all',$ENV{'form.showgrading'} eq 'yes' ? '1' : '0');
for (keys (%$handgrade)) {
my $ncol = &Apache::lonnet::EXT('resource.'.$_.
'.maxcollaborators',
@@ -1122,11 +1136,11 @@ KEYWORDS
$result .= 'invalid collaborators';
}
$result .= ': '.join(', ',@badcollaborators);
-
+ $result .= '</td></tr></table>';
}
if (scalar(@collaborators > $ncol)) {
$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>';
- $result .= 'This student has sumbitted too many '.
+ $result .= 'This student has submitted too many '.
'collaborators. Maximum is '.$ncol;
$result .= '</td></tr></table>';
}
@@ -1195,6 +1209,9 @@ KEYWORDS
# return if view submission with no grading option
if ($ENV{'form.showgrading'} eq '') {
$request->print('</td></tr></table></td></tr></table></form>'."\n");
+ $request->print(&show_grading_menu_form($symb,$url))
+ if (($ENV{'form.command'} eq 'submission') ||
+ ($ENV{'form.command'} eq 'processGroup' && $counter == $total));
return;
}
@@ -1227,8 +1244,6 @@ KEYWORDS
push @partlist,$partid;
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
-
-# $request->print($result);
}
$result='<input type="hidden" name="partlist'.$counter.
'" value="'.(join ":",@partlist).'" />'."\n";
@@ -1281,9 +1296,7 @@ sub get_last_submission {
for ($version=1;$version<=$returnhash{'version'};$version++) {
foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
$lasthash{$_}=$returnhash{$version.':'.$_};
-# if ($returnhash{$version.':'.$_} =~ /(SUBMITTED|DRAFT)$/) {
$timestamp = scalar(localtime($returnhash{$version.':timestamp'}));
-# }
}
}
foreach ((keys %lasthash)) {
@@ -1330,7 +1343,7 @@ sub processHandGrade {
my $ctr = 0;
while ($ctr < $ngrade) {
my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
- my ($errorflag) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
+ my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
if ($errorflag eq 'no_score') {
$ctr++;
next;
@@ -1344,7 +1357,9 @@ sub processHandGrade {
foreach (@msgnum) {
$message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
}
- $message =~ s/\s+/ /g;
+ $message =~ s/<([^>]|\n)*>//g; # removes html codes Or should this be lonnet::escape ??
+ $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
+ $message.=" for <a href=\"$url?symb=$symb\">$ENV{'form.probTitle'}</a>";
$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
$ENV{'form.msgsub'},$message);
}
@@ -1466,8 +1481,6 @@ sub processHandGrade {
$ENV{'form.student'} = $uname;
$ENV{'form.userdom'} = $udom;
$ENV{'form.fullname'} = $$fullname{$_};
-# $ENV{'form.'.$_.':submitted_by'} = $submitter;
-# print "submitter=$ENV{'form.'.$_.':submitted_by'}= $submitter:<br>";
&submission($request,$ctr,$total);
$ctr++;
}
@@ -1484,8 +1497,9 @@ sub processHandGrade {
#---- Save the score and award for each student, if changed
sub saveHandGrade {
my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter) = @_;
- my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
- my %newrecord;
+ my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
+ my %newrecord = ();
+ my ($pts,$wgt) = ('','');
foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq 'excused') {
if ($record{'resource.'.$_.'.solved'} ne 'excused') {
@@ -1495,11 +1509,11 @@ sub saveHandGrade {
}
}
} else {
- my $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ?
- $ENV{'form.GD_BOX'.$newflg.'_'.$_} :
- $ENV{'form.RADVAL'.$newflg.'_'.$_});
+ $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ?
+ $ENV{'form.GD_BOX'.$newflg.'_'.$_} :
+ $ENV{'form.RADVAL'.$newflg.'_'.$_});
return 'no_score' if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '');
- my $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 :
+ $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 :
$ENV{'form.WGT'.$newflg.'_'.$_};
my $partial= $pts/$wgt;
$newrecord{'resource.'.$_.'.awarded'} = $partial
@@ -1514,15 +1528,15 @@ sub saveHandGrade {
}
$newrecord{'resource.'.$_.'.submitted_by'} = $submitter
if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter));
+ $newrecord{'resource.'.$_.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
}
}
if (scalar(keys(%newrecord)) > 0) {
- $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
&Apache::lonnet::cstore(\%newrecord,$symb,
$ENV{'request.course.id'},$domain,$stuname);
}
- return '';
+ return '',$pts,$wgt;
}
#--------------------------------------------------------------------------------------
@@ -1707,8 +1721,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>'.&Apache::lonnet::metadata($ENV{'form.url'},'title')
- .'</font>'."\n";
+ $result.='<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
#view individual student submission form - called using Javascript viewOneStudent
$result.=&jscriptNform($url,$symb);
@@ -1718,7 +1731,10 @@ sub viewgrades {
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="command" value="editgrades" />'."\n".
- '<input type="hidden" name="section" value="'.$ENV{'form.section'}.'" />'."\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="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
+
$result.='<h3>Assign Common Grade To ';
if ($ENV{'form.section'} eq 'all') {
$result.='Class </h3>';
@@ -1729,12 +1745,6 @@ sub viewgrades {
}
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
'<table border=0><tr bgcolor="#ffffdd"><td>';
-# $result.='To assign the same score for all the students use the radio buttons or '.
-# 'text box below. To assign scores individually fill in the score boxes for '.
-# 'each student in the table below. <font color="red">A part that has already '.
-# 'been graded does not get changed using the radio buttons or text box. '.
-# 'If needed, it has to be changed individually.</font>';
-# $result.='</td></tr><tr><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'});
@@ -1813,7 +1823,7 @@ sub viewgrades {
#get info for each student
#list all the students - with points and grade status
- my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
+ my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
my $ctr = 0;
foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
my ($uname,$udom) = split(/:/);
@@ -1884,10 +1894,8 @@ 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>'.
- &Apache::lonnet::metadata($ENV{'form.url'},'title').'</font><br />'."\n";
+ $title.='<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";
$title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";
- $title.= &show_grading_menu_form ($symb,$url);
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>Fullname</b></td>'."\n";
@@ -1987,6 +1995,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'}";
$updateflag=1;
}
$result .= '<td align="center">'.$old_aw.' </td>'.
@@ -1996,12 +2005,12 @@ sub editgrades {
$result .= '</tr>'."\n";
if ($updateflag) {
$count++;
- $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
&Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
$udom,$user);
}
}
- $result .= '</table></td></tr></table>'."\n";
+ $result .= '</table></td></tr></table>'."\n".
+ &show_grading_menu_form ($symb,$url);
my $msg = '<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 />';
@@ -2109,8 +2118,7 @@ sub csvuploadmap_header {
}
my $result='<table border="0">';
- $result.='<tr><td colspan=3><font size=+1><b>Problem: </b>'.&Apache::lonnet::metadata($url,'title')
- .'</font></td></tr>';
+ $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)) {
@@ -2141,6 +2149,8 @@ to this page if the data selected is ins
value="$ENV{'form.upfile_associate'}" />
<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="url" value="$url" />
+<input type="hidden" name="saveState" value="$ENV{'form.saveState'}" />
+<input type="hidden" name="probTitle" value="$ENV{'form.probTitle'}" />
<input type="hidden" name="command" value="csvuploadassign" />
<hr />
<script type="text/javascript" language="Javascript">
@@ -2181,6 +2191,7 @@ sub csvuploadmap {
my ($request)= @_;
my ($symb,$url)=&get_symb_and_url($request);
if (!$symb) {return '';}
+
my $datatoken;
if (!$ENV{'form.datatoken'}) {
$datatoken=&Apache::loncommon::upfile_store($request);
@@ -2209,6 +2220,8 @@ sub csvuploadmap {
}
}
&csvuploadmap_footer($request,$i,$keyfields);
+ $request->print(&show_grading_menu_form($symb,$url));
+
return '';
}
@@ -2272,182 +2285,10 @@ sub csvuploadassign {
#------------- end of section for handling csv file upload ---------
#
#-------------------------------------------------------------------
-
-#-------------------------- Menu interface -------------------------
#
-#--- 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".
- '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
- '<input type="hidden" name="url" value="'.$url.'" />'."\n".
- '<input type="hidden" name="command" value="gradingmenu" />'."\n".
- '<input type="submit" name="submit" value="Grading Menu" />'."\n".
- '</form>'."\n";
- return $result;
-}
-
-#--- Displays the main menu page -------
-sub gradingmenu {
- my ($request) = @_;
- my ($symb,$url)=&get_symb_and_url($request);
- if (!$symb) {return '';}
- my $result='<h3> <font color="#339933">Select a Grading Method</font></h3>';
- $result.='<table border="0">';
- $result.='<tr><td colspan=3><font size=+1><b>Problem: </b>'.
- &Apache::lonnet::metadata($ENV{'form.url'},'title').'</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>';
- $result.=&view_edit_entire_class_form($symb,$url).'<br />';
- $result.=&upcsvScores_form($symb,$url).'<br />';
- $result.=&viewGradeaStu_form($symb,$url,$resptype,$hdgrade).'<br />';
- $result.=&gradeByPage_form($symb,$url,$resptype,$hdgrade).'<br />';
- $result.=&verifyReceipt_form($symb,$url)
- if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb));
-
- return $result;
-}
-
-#--- Menu for grading a section or the whole class ---
-sub view_edit_entire_class_form {
- my ($symb,$url)=@_;
- my ($classlist,$sections,undef) = &getclasslist('all','0');
- my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
- $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
- $result.=' <b>Grade Entire Section or Class</b></td></tr>'."\n";
- $result.='<tr bgcolor=#ffffe6><td>'."\n";
- $result.='<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="command" value="viewgrades" />'."\n";
- $result.=' <b>Select section:</b> <select name="section">'."\n";
- if (ref($sections)) {
- foreach (sort (@$sections)) {
- $result.= '<option>'.$_.'</option>'."\n";
- }
- }
- $result.='<option selected="on">all</select>'."<br />\n";
- $result.=' <input type="button" onClick="submit();" value="Grade" /></form>'."\n";
- $result.='</td></tr></table>'."\n";
- $result.='</td></tr></table>'."\n";
- return $result;
-}
-
-#--- Menu to upload a csv scores ---
-sub upcsvScores_form {
- my ($symb,$url) = @_;
- if (!$symb) {return '';}
- my $result = '<script type="text/javascript" language="javascript">'."\n".
- ' function checkUpload(formname) {'."\n".
- ' if (formname.upfile.value == "") {'."\n".
- ' alert("Please use the browse button to select a file from your local directory.");'."\n".
- ' return false;'."\n".
- ' }'."\n".
- ' formname.submit();'."\n".
- ' }'."\n".
- '</script>'."\n";
-
- $result.='<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 above resource</b></td></tr>'."\n";
- $result.='<tr bgcolor=#ffffe6><td>'."\n";
- my $upfile_select=&Apache::loncommon::upfile_select_html();
- $result.=<<ENDUPFORM;
-<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
-<input type="hidden" name="symb" value="$symb" />
-<input type="hidden" name="url" value="$url" />
-<input type="hidden" name="command" value="csvuploadmap" />
-$upfile_select
-<br /> <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Grades" />
-</form>
-ENDUPFORM
- $result.='</td></tr></table>'."\n";
- $result.='</td></tr></table>'."\n";
- return $result;
-}
-
-#--- Handgrading problems ---
-sub viewGradeaStu_form {
- my ($symb,$url,$response,$handgrade) = @_;
- my ($classlist,$sections) = &getclasslist('all','0');
- my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
- $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
- $result.=' <b>';
- $result.=($handgrade eq 'yes' ? 'View/Grade' : 'View').' an Individual Student\'s Submission</b></td></tr>'."\n";
- $result.='<tr bgcolor=#ffffe6><td>'."\n";
- $result.='<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="response" value="'.$response.'" />'."\n".
- '<input type="hidden" name="handgrade" value="'.$handgrade.'" />'."\n".
- '<input type="hidden" name="showgrading" value="yes" />'."\n".
- '<input type="hidden" name="command" value="submission" />'."\n";
-
- $result.=' <b>Select section:</b> <select name="section">'."\n";
- if (ref($sections)) {
- foreach (sort (@$sections)) {$result.='<option>'.$_.'</option>'."\n";}
- }
- $result.= '<option selected="on">all</select>'."\n";
- $result.=' <b>Display students who has: </b>'.
- '<input type="radio" name="submitonly" value="yes" checked> submitted'.
- '<input type="radio" name="submitonly" value="all"> everybody <br />';
- if (ref($sections)) {
- $result.=' (Section "no" implies the students were not assigned a section.)<br />'
- if (grep /no/,@$sections);
- }
-
-
- $result.='<br /> <input type="button" onClick="submit();" value="';
- if ($handgrade eq 'yes') {
- $result.="View/Grade";
- } else {
- $result.="View";
- }
- $result.='" />'."\n".'</form>'."\n";
- $result.='</td></tr></table>'."\n";
- $result.='</td></tr></table>'."\n";
- return $result;
-}
-
-#--- Handgrading problems by page/sequence for each student ---
-sub gradeByPage_form {
- my ($symb,$url,$response,$handgrade) = @_;
- my ($classlist,$sections) = &getclasslist('all','0');
- my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
- $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
- $result.=' <b>';
- $result.='Handgrade an Individual Student\'s by Page/Sequence</b></td></tr>'."\n";
- $result.='<tr bgcolor=#ffffe6><td>'."\n";
- $result.='<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="response" value="'.$response.'" />'."\n".
- '<input type="hidden" name="handgrade" value="'.$handgrade.'" />'."\n".
- '<input type="hidden" name="showgrading" value="yes" />'."\n".
- '<input type="hidden" name="command" value="pickStudentPage" />'."\n";
-
- $result.=' <b>Select section:</b> <select name="section">'."\n";
- if (ref($sections)) {
- foreach (sort (@$sections)) {$result.='<option>'.$_.'</option>'."\n";}
- }
- $result.= '<option selected="on">all</select>'."\n";
-
- $result.='<br /> <input type="button" onClick="submit();" value="';
- $result.='View/Grade'.'" />'."\n".'</form>'."\n";
- $result.='</td></tr></table>'."\n";
- $result.='</td></tr></table>'."\n";
- return $result;
-}
-
+#-------------- Next few routines handles grading by page/sequence
+#
+#--- Select a page/sequence and a student to grade
sub pickStudentPage {
my ($request) = shift;
@@ -2455,8 +2296,7 @@ sub pickStudentPage {
<script type="text/javascript" language="javascript">
function checkPickOne(formname) {
- var user = radioSelection(formname.student);
- if (user == null) {
+ if (radioSelection(formname.student) == null) {
alert("Please select the student you wish to grade.");
return;
}
@@ -2468,28 +2308,34 @@ function checkPickOne(formname) {
function radioSelection(radioButton) {
var selection=null;
- for (var i=0; i<radioButton.length; i++) {
- if (radioButton[i].checked) {
- selection=radioButton[i].value;
- return selection;
- }
+ 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=null;
- for (var i=0; i<selectOne.length; i++) {
- if (selectOne[i].selected) {
- selection=selectOne[i].value;
- return selection;
- }
+ 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
- my ($symb,$url) = &get_symb_and_url();
+ 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"};
my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
@@ -2499,7 +2345,7 @@ LISTJAVASCRIPT
$result.='<form action="/adm/grades" method="post" name="displayPage">'."<br>\n";
$result.=' <b>Problems from:</b> <select name="selectpage">'."\n";
- my ($titles,$symbx) = &getSymbMap();
+ my ($titles,$symbx) = &getSymbMap($request);
my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/);
my $ctr=0;
foreach (@$titles) {
@@ -2517,22 +2363,29 @@ LISTJAVASCRIPT
$result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n";
$ctr++;
}
- $result.='<input type="hidden" name="page" />'."\n";
- $result.='<input type="hidden" name="title" />'."\n";
+ $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".
'<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="all" /> all details'."\n";
+
$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n".
- '<input type="hidden" name="command" value="displayPage" />'."\n".
- '<input type="hidden" name="url" value="'.$url.'" />'."\n".
- '<input type="hidden" name="symb" value="'.$symb.'" />'."<br><br>\n";
+ '<input type="hidden" name="command" value="displayPage" />'."\n".
+ '<input type="hidden" name="url" value="'.$url.'" />'."\n".
+ '<input type="hidden" name="symb" value="'.$symb.'" />'."<br><br>\n".
+ '<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n";
+
+ $result.='<br /> <input type="button" '.
+ 'onClick="javascript:checkPickOne(this.form);"value="Submit" /><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</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>'.
@@ -2540,7 +2393,7 @@ LISTJAVASCRIPT
'<td><b> Fullname <font color="#999999">(username)</font></b></td>'.
'<td><b> Fullname <font color="#999999">(username)</font></b></td></tr>';
- my (undef,undef,$fullname) = &getclasslist($getsec,'0');
+ 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);
@@ -2564,7 +2417,8 @@ LISTJAVASCRIPT
}
sub getSymbMap {
- my $navmap = Apache::lonnavmaps::navmap-> new(
+ my ($request) = @_;
+ my $navmap = Apache::lonnavmaps::navmap-> new($request,
$ENV{'request.course.fn'}.'.db',
$ENV{'request.course.fn'}.'_parms.db',1, 1);
@@ -2620,15 +2474,17 @@ sub getSymbMap {
return \@titles,\%symbx;
}
+#
+#--- Displays a page/sequence w/wo problems, w/wo submissions
sub displayPage {
my ($request) = shift;
- my ($symb,$url) = &get_symb_and_url();
+ 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"};
my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
my $pageTitle = $ENV{'form.page'};
- my (undef,undef,$fullname) = &getclasslist($getsec,'0');
+ my (undef,undef,$fullname) = &getclasslist($getsec,'1');
my ($uname,$udom) = split(/:/,$ENV{'form.student'});
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>';
@@ -2638,7 +2494,7 @@ sub displayPage {
&sub_page_js($request);
$request->print($result);
- my $navmap = Apache::lonnavmaps::navmap-> new(
+ my $navmap = Apache::lonnavmaps::navmap-> new($request,
$ENV{'request.course.fn'}.'.db',
$ENV{'request.course.fn'}.'_parms.db',1, 1);
my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
@@ -2648,12 +2504,13 @@ sub displayPage {
$map->map_finish());
my $studentTable='<form action="/adm/grades" method="post" name="gradePage">'."\n".
- '<input type="hidden" name="command" value="gradeByPage" />'."\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="command" value="gradeByPage" />'."\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="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n";
my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';
@@ -2674,7 +2531,7 @@ sub displayPage {
if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
my $parts = $curRes->parts();
- if (scalar(@{$parts}) > 1) { shift @{$parts}; }
+ $parts = &temp_parts_fix($parts); # remove line when lonnavmap is fixed
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
@@ -2715,17 +2572,23 @@ sub displayPage {
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:</b> '.$partid.' <b>Submission:</b> '
+ '<b>Trial '.$version.' Part '.$partid.'</b> '
.$record{$version.':'.$matchKey[0]}.'<br />' : '';
$displaySub[1].=(exists $record{"$version:resource.$partid.award"}) ?
- '<b>Part:</b> '.$partid.' '.
+ '<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[1].=(exists $record{"$version:resource.regrader"}) ?
- 'Manually graded by '.$record{"$version:resource.regrader"} : '';
- $studentTable.='<td>'.$displaySub[0].' </td><td>'.$displaySub[1].' </td></tr>';
+ $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>';
}
$studentTable.='</table></td></tr></table>';
}
@@ -2748,7 +2611,6 @@ sub displayPage {
$curRes = $iterator->next();
$ctr++;
}
- $navmap->init();
$studentTable.='</td></tr></table></td></tr></table>'."\n".
' <input type="button" value="Save" '.
@@ -2760,6 +2622,18 @@ sub displayPage {
return '';
}
+sub temp_parts_fix { #remove sub once lonnavmap is fixed
+ my $parts = shift;
+ my %seen = ();
+ my @correctParts = ();
+ foreach (@{$parts}) {
+ next if ($seen{$_} > 0);
+ $seen{$_}++;
+ push @correctParts,$_;
+ }
+ return \@correctParts;
+}
+
sub updateGradeByPage {
my ($request) = shift;
@@ -2767,7 +2641,7 @@ sub updateGradeByPage {
my $cnum = $ENV{"course.$ENV{'request.course.id'}.num"};
my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
my $pageTitle = $ENV{'form.page'};
- my (undef,undef,$fullname) = &getclasslist($getsec,'0');
+ my (undef,undef,$fullname) = &getclasslist($getsec,'1');
my ($uname,$udom) = split(/:/,$ENV{'form.student'});
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>';
@@ -2776,7 +2650,7 @@ sub updateGradeByPage {
$request->print($result);
- my $navmap = Apache::lonnavmaps::navmap-> new(
+ my $navmap = Apache::lonnavmaps::navmap-> new($request,
$ENV{'request.course.fn'}.'.db',
$ENV{'request.course.fn'}.'_parms.db',1, 1);
my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
@@ -2801,7 +2675,7 @@ sub updateGradeByPage {
if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
my $parts = $curRes->parts();
- if (scalar(@{$parts}) > 1) { shift @{$parts}; }
+ $parts = &temp_parts_fix($parts); # remove line when lonnavmap is fixed
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
@@ -2844,11 +2718,11 @@ sub updateGradeByPage {
}
$newrecord{'resource.'.$partid.'.awarded'} = $partial if $partial ne '';
$newrecord{'resource.'.$partid.'.solved'} = $score;
+ $newrecord{'resource.'.$partid.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
$changeflag++;
}
if (scalar(keys(%newrecord)) > 0) {
- $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
&Apache::lonnet::cstore(\%newrecord,$symbx,$ENV{'request.course.id'},
$udom,$uname);
}
@@ -2860,53 +2734,374 @@ sub updateGradeByPage {
$curRes = $iterator->next();
$ctr++;
}
- $navmap->init();
$studentTable.='</td></tr></table></td></tr></table>';
- $studentTable.=($changeflag == 0 ? 'No score was changed or updated.' :
- 'The scores were changed for '.
- $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
$studentTable.=&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'});
- $request->print($studentTable);
+ my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
+ 'The scores were changed for '.
+ $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
+ $request->print($grademsg.$studentTable);
return '';
}
+#-------- end of section for handling grading by page/sequence ---------
+#
+#-------------------------------------------------------------------
+
+#--------------------Scantron Grading-----------------------------------
+#
+#------ start of section for handling grading by page/sequence ---------
-#--- Form to input a receipt number ---
-sub verifyReceipt_form {
- my ($symb,$url) = @_;
- my $result = '<script type="text/javascript" language="javascript">'."\n".
- ' function checkEntry(formname) {'."\n".
- ' var receipt = formname.receipt.value;'."\n".
- ' if (isNaN(receipt) || receipt == "") {'."\n".
- ' alert("Please enter a receipt number given by a student in the box.");'."\n".
- ' return false;'."\n".
- ' }'."\n".
- ' formname.submit();'."\n".
- ' }'."\n".
- '</script>'."\n";
+sub getSequenceDropDown {
+ my ($request,$symb)=@_;
+ my $result='<select name="selectpage">'."\n";
+ my ($titles,$symbx) = &getSymbMap($request);
+ my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/);
+ my $ctr=0;
+ foreach (@$titles) {
+ my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
+ $result.='<option value="'.$$symbx{$_}.'" '.
+ ($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : '').
+ '>'.$showtitle.'</option>'."\n";
+ $ctr++;
+ }
+ $result.= '</select>';
+ return $result;
+}
+
+sub scantron_selectphase {
+ my ($r) = @_;
+ my ($symb,$url)=&get_symb_and_url($r);
+ if (!$symb) {return '';}
+ my $sequence_selector=&getSequenceDropDown($r,$symb);
+ my $result;
+ $result.= <<SCANTRONFORM;
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
+ <input type="hidden" name="symb" value="$symb" />
+ <input type="hidden" name="url" value="$url" />
+ <input type="hidden" name="command" value="scantron_configphase" />
+ <table width="100%" border="0">
+ <tr>
+ <td bgcolor="#777777">
+ <table width="100%" border="0">
+ <tr bgcolor="#e6ffff">
+ <td>
+ <b>Specify file location and which Folder/Sequence to grade</b>
+ </td>
+ </tr>
+ <tr bgcolor="#ffffe6">
+ <td>
+ Sequence to grade: $sequence_selector
+ </td>
+ </tr>
+ <tr bgcolor="#ffffe6">
+ <td>
+ <!-- FIXME I need to present a list of files from a specfic directory that has been configured, or any existing delay queues -->
+ Filename of scoring office file:
+ <select name="selectfile">
+ <option value="filname1">filename1</option>
+ <option value="filname2">filename2</option>
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <input type="submit" value="Submit" />
+</form>
+SCANTRONFORM
+
+ return $result;
+}
+
+sub scantron_configphase {
+ my ($r) = @_;
+ my $sequence=$ENV{'form.selectpage'};
+ my $result;
+ $result.="got page $sequence";
+ $Apache::lonxml::debug=1;
+ &Apache::lonhomework::showhash(%ENV);
+ $Apache::lonxml::debug=0;
+ #FIXME Needs to present some lines from the file and allow the instructor to specify which columns represent what data, possibly have some nice defaults setup, probably should do a pass through all problems for a student to get an idea of how many questions there are, and homw many lines we'll have,
+ return $result;
+}
+
+sub scantron_process_students {
+ #FIXME
+ # loop through students, {
+ # Check if studnet info valid, if not add line to delay queue
+ # foreach question 'submit' the students answer to the server
+ # through grade target {
+ # generate data to pass back that includes grade recevied
+ # }
+ # }
+ # loop through delay queue {
+ # print out each delayed student with interface to select how
+ # to repair student provided info
+ # Expected errors include
+ # 1 bad/no stuid/username
+ # 2 invalid bubblings
+ # }
+ # if delay queue exists 2 submits one to process delayed students one
+ # to ignore delayed students, possibly saving the delay queue for later
+
+}
+#-------- end of section for handling grading scantron forms -------
+#
+#-------------------------------------------------------------------
+
+
+#-------------------------- Menu interface -------------------------
+#
+#--- 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".
+ '<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".
+ '<input type="hidden" name="command" value="gradingmenu" />'."\n".
+ '<input type="submit" name="submit" value="Grading Menu" />'."\n".
+ '</form>'."\n";
+ return $result;
+}
- my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
+# -- Retrieve choices for grading form
+sub savedState {
+ my %savedState = ();
+ if ($ENV{'form.saveState'}) {
+ foreach (split(/:/,$ENV{'form.saveState'})) {
+ my ($key,$value) = split(/=/,$_,2);
+ $savedState{$key} = $value;
+ }
+ }
+ return \%savedState;
+}
- $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
- $result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n";
- $result.=' <b>Verify a Submission Receipt Issued by this Server</td></tr>'."\n";
- $result.='<tr bgcolor=#ffffe6><td>'."\n";
- $result.='<form action="/adm/grades" method="post" name="verifyform">'."\n";
- $result.=' <tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
- $result.=' <input type="button" onClick="javascript:checkEntry(this.form);"'.
- ' value="Verify Receipt">'."\n";
- $result.='<input type="hidden" name="command" value="verify">'."\n";
- if ($ENV{'form.url'}) {
- $result.='<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />';
+#--- Displays the main menu page -------
+sub gradingmenu {
+ my ($request) = @_;
+ my ($symb,$url)=&get_symb_and_url($request);
+ if (!$symb) {return '';}
+ my $probTitle = &Apache::lonnet::gettitle($symb);
+
+ $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)+
+ ":saveSub="+radioSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.status);
+ if (cmd[0].checked || cmd[1].checked || cmd[2].checked || cmd[4].checked) formname.submit();
+
+ if (cmd[3].checked) browseAndUpload();
+
+ if (cmd[5].checked) {
+ if (!checkReceiptNo(formname,'notOK')) { return false;}
+ formname.submit();
+ }
}
- if ($ENV{'form.symb'}) {
- $result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
+
+ function checkReceiptNo(formname,nospace) {
+ var receiptNo = formname.receipt.value;
+ var checkOpt = false;
+ if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
+ if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
+ if (checkOpt) {
+ alert("Please enter a receipt number given by a student in the receipt box.");
+ formname.receipt.value = "";
+ 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;
}
- $result.='</form>';
- $result.='</td></tr></table>'."\n";
- $result.='</td></tr></table>'."\n";
+
+ 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;
+ }
+ }
+
+ function browseAndUpload() {
+ bNLoad = window.open('', 'BrowseAndUpload', 'toolbar=no,location=no,scrollbars=no,width=550,height=200,screenx=100,screeny=75');
+ bNLoad.focus();
+ var lDoc = bNLoad.document;
+ lDoc.write("<html><head>");
+ lDoc.write("<title>Browse And Upload</title>");
+
+ lDoc.write("<script language=javascript>");
+ lDoc.write("function checkUpload(formname) {");
+
+ lDoc.write(" if (formname.upfile.value == \\"\\") {");
+ lDoc.write(" alert(\\"Please use the browse button to select a file from your local directory.\\");");
+ lDoc.write(" return false;");
+ lDoc.write(" }");
+ lDoc.write(" var openformname = opener.document.gradingMenu;");
+ lDoc.write(" formname.saveState.value = \\"saveCmd=\\"+opener.radioSelection(openformname.command)+\\":saveSec=\\"+opener.pullDownSelection(openformname.section)+\\":saveSub=\\"+opener.radioSelection(openformname.submitonly)+\\":saveStatus=\\"+opener.pullDownSelection(openformname.status);");
+ lDoc.write(" document.gradesupload.submit();");
+ lDoc.write(" if (navigator.appName !=\\"Netscape\\") {self.close()};");
+ lDoc.write(" setTimeout('self.close()',750)");
+ lDoc.write("}");
+
+ lDoc.write("<");
+ lDoc.write("/script>");
+
+ lDoc.write("</head><body bgcolor=white>");
+ lDoc.write("<form method=\\"post\\" enctype=\\"multipart/form-data\\" action=\\"/adm/grades\\" name=\\"gradesupload\\" target=\\"LONcatInfo\\">");
+ lDoc.write("<input type=\\"hidden\\" name=\\"symb\\" value=\\"$symb\\">");
+ lDoc.write("<input type=\\"hidden\\" name=\\"url\\" value=\\"$url\\">");
+ lDoc.write("<input type=\\"hidden\\" name=\\"probTitle\\" value=\\"$probTitle\\">");
+ lDoc.write("<input type=\\"hidden\\" name=\\"saveState\\" value=\\"\\">");
+ lDoc.write("<input type=\\"hidden\\" name=\\"command\\" value=\\"csvuploadmap\\">");
+
+ lDoc.write("<font color=\\"green\\" size=+1> <b>Specify a file containing the class scores for problem - $probTitle</b></font><br><br>");
+
+ lDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+ lDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+ lDoc.write("<td>");
+ lDoc.write("<input type=\\"file\\" name=\\"upfile\\" size=\\"50\\" />");
+ lDoc.write("<br />Type: <select name=\\"upfiletype\\">");
+ lDoc.write("<option value=\\"csv\\">CSV (comma separated values, spreadsheet)</option>");
+ lDoc.write("<option value=\\"space\\">Space separated</option>");
+ lDoc.write("<option value=\\"tab\\">Tabulator separated</option>");
+ lDoc.write("<option value=\\"xml\\">HTML/XML</option>");
+ lDoc.write("</select>");
+ lDoc.write("</td></tr></table>");
+ lDoc.write("</td></tr></table> ");
+ lDoc.write("<input type=\\"button\\" value=\\"Upload Scores\\" onClick=\\"javascript:checkUpload(this.form)\\"> ");
+ lDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+ lDoc.write("</form>");
+ lDoc.write("</body></html>");
+ }
+</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";
+
+ my (undef,$sections) = &getclasslist('all','0');
+ my $savedState = &savedState();
+ my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'pickStudentPage' : $$savedState{'saveCmd'});
+ my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
+ my $saveSub = ($$savedState{'saveSub'} eq '' ? 'yes' : $$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="saveState" value="" />'."\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".
+ ' <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="csvupload" '.
+ ($saveCmd eq 'csvupload' ? '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" /> '.
+ '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";
+ }
+
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2"><br />'."\n".
+ ' Select section: <select name="section">'."\n";
+ if (ref($sections)) {
+ foreach (sort (@$sections)) {$result.='<option value="'.$_.'" '.
+ ($saveSec eq $_ ? 'selected="on"' : '').'>'.$_.'</option>'."\n";}
+ }
+ $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> ';
+
+ $result.='Student Status:</b><select name="status">'.
+ '<option value="Active" '.($saveStatus eq 'Active' ? 'selected' : '').'>Active</option>'.
+ '<option value="Expired" '.($saveStatus eq 'Expired' ? 'selected' : '').'>Expired</option>'.
+ '<option value="Any" '.($saveStatus eq 'Any' ? 'selected' : '').'>Any</option>'.
+ '</select>';
+
+ $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 />'
+ if (grep /no/,@$sections);
+ }
+ $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".
+ '</td></tr></table>'."\n".
+ '</td></tr></table>'."\n";
return $result;
}
@@ -2961,9 +3156,6 @@ sub handler {
$Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
if ($command eq 'submission') {
($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
-# if ($command eq 'submission') {
-# &listStudents($request) if ($ENV{'form.student'} eq '');
-# &submission($request,0,0) if ($ENV{'form.student'} ne '');
} elsif ($command eq 'pickStudentPage') {
&pickStudentPage($request);
} elsif ($command eq 'displayPage') {
@@ -2982,6 +3174,8 @@ sub handler {
$request->print(&editgrades($request));
} elsif ($command eq 'verify') {
$request->print(&verifyreceipt($request));
+ } elsif ($command eq 'csvform') {
+ $request->print(&upcsvScores_form($request));
} elsif ($command eq 'csvupload') {
$request->print(&csvupload($request));
} elsif ($command eq 'viewclasslist') {
@@ -2999,6 +3193,10 @@ sub handler {
}
$request->print(&csvuploadmap($request));
}
+ } elsif ($command eq 'scantron_selectphase') {
+ $request->print(&scantron_selectphase($request));
+ } elsif ($command eq 'scantron_configphase') {
+ $request->print(&scantron_configphase($request));
} else {
$request->print("Unknown action: $command:");
}