[LON-CAPA-cvs] cvs: loncom /homework grades.pm
ng
lon-capa-cvs@mail.lon-capa.org
Wed, 10 Jul 2002 21:08:39 -0000
This is a MIME encoded message
--ng1026335319
Content-Type: text/plain
ng Wed Jul 10 17:08:39 2002 EDT
Modified files:
/loncom/homework grades.pm
Log:
clean up codes for writing to and reading from handgrade.db
doing some testing on hires timer - getclasslist takes around 3-3.5 seconds
for 285 students.
--ng1026335319
Content-Type: text/plain
Content-Disposition: attachment; filename="ng-20020710170839.txt"
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.37 loncom/homework/grades.pm:1.38
--- loncom/homework/grades.pm:1.37 Mon Jul 8 17:18:54 2002
+++ loncom/homework/grades.pm Wed Jul 10 17:08:38 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.37 2002/07/08 21:18:54 ng Exp $
+# $Id: grades.pm,v 1.38 2002/07/10 21:08:38 ng Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,7 +40,9 @@
use Apache::lonnet;
use Apache::loncommon;
use Apache::lonhomework;
+use Apache::lonmsg qw(:user_normal_msg);
use Apache::Constants qw(:common);
+use Time::HiRes qw( gettimeofday tv_interval );
sub moreinfo {
my ($request,$reason) = @_;
@@ -159,7 +161,12 @@
}
$request->print('<input type="hidden" name="command" value="processGroup" />'."\n");
+ my $t0=&Time::HiRes::time();
+
my ($classlist) = &getclasslist($getsec,'0');
+ my $t1=&Time::HiRes::time();
+ print "getclasslist=",$t1-$t0,"<br />";
+
foreach my $student ( sort(@{ $$classlist{$getsec} }) ) {
my ($sname,$sdom) = split(/:/,$student);
my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname);
@@ -178,6 +185,8 @@
$request->print('</tr>');
}
}
+ my $t2=&Time::HiRes::time();
+ print "processclasslist=",$t2-$t1,"<br />";
$request->print('</table></td></tr></table>');
$request->print('<input type="submit" name="submit" value="View/Grade" /><form />');
}
@@ -291,7 +300,7 @@
$result.="</select></td>\n";
}
}
- $result.='<td></td></tr>';
+ $result.='</td></tr>';
return $result;
}
@@ -352,905 +361,949 @@
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) = &finduser($ENV{'form.student'});
+ 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' : '');
+
+ # header info
if ($counter == 0) {
- $request->print(<<SUBJAVASCRIPT);
-<script type="text/javascript" language="javascript">
- function updateRadio(radioButton,formtextbox,formsel,wgt) {
- var pts = formtextbox.value;
- var resetbox =false;
- if (isNaN(pts) || pts < 0) {
- alert("A number equal or greater than 0 is expected. Entered value = "+pts);
- for (var i=0; i<radioButton.length; i++) {
- if (radioButton[i].checked) {
- formtextbox.value = i;
- resetbox = true;
- }
- }
- if (!resetbox) {
- formtextbox.value = "";
- }
- return;
- }
+ &sub_page_js($request);
+ $request->print('<h2> <font color="#339933">Submission Record</font></h2>'.
+ '<font size=+1> <b>Resource: </b>'.$url.'</font>');
- for (var i=0; i<radioButton.length; i++) {
- radioButton[i].checked=false;
- if (pts == i) {
- radioButton[i].checked=true;
- }
- }
- updateSelect(formsel,pts,wgt);
+ # option to display problem, only once else it cause problems with the form later
+ # since the problem has a form.
+ if ($ENV{'form.vProb'} eq 'yes') {
+ my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+ $ENV{'request.course.id'});
+ my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+ $ENV{'request.course.id'});
+ my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
+ $result.='<table border="0" width="100%"><tr><td bgcolor="#e6ffff">';
+ $result.='<b>Student\'s view of the problem</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />';
+ $result.='<b>Correct answer:</b><br />'.$companswer;
+ $result.='</td></tr></table>';
+ $result.='</td></tr></table><br />';
+ $request->print($result);
+ }
+
+ # kwclr is the only variable that is non blank if this has been used once.
+ my %keyhash = ();
+ if ($ENV{'form.kwclr'} eq '') {
+ %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.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?
+ $keyhash{$symb.'_subject'} : &Apache::lonnet::metadata($url,'title');
+ $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="symb" value="'.$symb.'" />'."\n".
+ '<input type="hidden" name="url" value="'.$url.'" />'."\n".
+ '<input type="hidden" name="vProb" value="'.$ENV{'form.vProb'}.'" />'."\n".
+ '<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");
+
+ my ($cts,$prnmsg) = (1,'');
+ while ($cts <= $ENV{'form.savemsgN'}) {
+ $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
+ ($keyhash{$symb.'_savemsg'.$cts} eq '' ? $ENV{'form.savemsg'.$cts} : $keyhash{$symb.'_savemsg'.$cts}).
+ '" />'."\n";
+ $cts++;
+ }
+ $request->print($prnmsg);
+
+ if ($ENV{'form.handgrade'} eq 'yes') {
+ $request->print(<<KEYWORDS);
+ <b>Keyword Options:</b>
+<a href="javascript:keywords(document.SCORE.keywords)"; 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 />
+KEYWORDS
+ }
}
- function writeBox(formrad,formsel,pts,wgt) {
- formrad.value = pts;
- updateSelect(formsel,pts,wgt);
- return;
+ # Student info
+ $request->print(($counter == 0 ? '' : '<br />'));
+ my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom));
+ my $result.='<table border="0" width=100%><tr><td bgcolor="#777777">'.
+ '<table border="0" width=100%><tr bgcolor="#ffffff"><td>';
+ $result.='<table border="0"><tr bgcolor="#ffffff"><td><b>Username: </b>'.$uname.
+ '</td><td><b>Fullname: </b>'.$fullname.
+ '</td><td><b>Domain: </b>'.$udom.'</td></tr>';
+ if ($ENV{'form.handgrade'} eq 'yes') {
+# my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'});
+ my ($classlist) = &getclasslist('all','0');
+ my @collaborators;
+# foreach ( sort(@{ $$classlist{'all'} }) ) {
+# my ($sname,$sdom) = split(/:/);
+# push @collaborators,$sname if (grep /\b$sname(\b|\.)/i,$subonly);
+# }
+# push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators.
+ if (scalar(@collaborators) != 0) {
+ $result.='<tr bgcolor="#ffffff"><td colspan=3><b>Collaborators: </b>';
+ foreach (@collaborators) {
+ $result.=$_.' ('.&get_fullname($_,$udom).') ';
+ }
+ $result.='</td></tr>'."\n";
+ $result.='<input type="hidden" name="collaborator'.$counter.
+ '" value="'.(join ':',@collaborators).'" />'."\n";
+ }
}
+ $result.='</table>'."\n";
+ $request->print($result);
- function updateSelect(formsel,pts,wgt) {
- if (pts == 0) {
- formsel[1].selected = true;
- }
- if (pts > 0 && pts < wgt) {
- formsel[4].selected = true;
- }
- if (pts == wgt) {
- formsel[0].selected = true;
- }
- return;
+ # print student answer
+ if ($ENV{'form.lastSub'} eq 'lastonly') {
+ my ($string,$timestamp)=&get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'});
+ $string=&keywords_highlight(join('::::',@$string));
+ my $lastsubonly='<table border="0" width=100%><tr><td bgcolor="#777777">';
+ $lastsubonly.='<table border="0" width=100%><tr bgcolor="#ddffff">';
+ $lastsubonly.='<td><b>Last Submission Only</b>'.
+ ($timestamp eq '' ? '' : ' <b>Date Submitted:</b> '.@$timestamp).'</td></tr>';
+ $lastsubonly.='<tr><td bgcolor="#ffffe6">';
+ $lastsubonly.=$string;
+ $lastsubonly.='</td></tr></table></td></tr></table>'."\n";
+ $request->print($lastsubonly);
+ } else {
+ $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
+ $ENV{'request.course.id'},$last,
+ '.submission','Apache::grades::keywords_highlight'));
}
- function keywords(keyform) {
- var keywds = keyform.value;
- var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keywds);
- if (nret==null) return;
- keyform.value = nret;
- return;
+ my $wgt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname);
+ my $wgtmsg = ($wgt > 0 ? '(problem weight)' : '<font color="red">problem weight assigned by computer</font>');
+ $wgt = ($wgt > 0 ? $wgt : '1');
+ my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+ my $score = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt);
+
+ # display grading options
+ $result='<input type="hidden" name="WGT'.$counter.'" value="'.$wgt.'" />'.
+ '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'.$udom.'" />'."\n";
+ $result.='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
+ $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n";
+ $result.='<table border="0"><tr><td><b>Points</b></td><td>';
+
+ my $ctr = 0;
+ $result.='<table border="0"><tr>'; # display radio buttons in a nice table with 10 across
+ while ($ctr<=$wgt) {
+ $result.= '<td><input type="radio" name="RADVAL'.$counter.'" '.
+ 'onclick="javascript:writeBox(this.form.GRADE_BOX'.$counter.
+ ',this.form.GRADE_SEL'.$counter.','.$ctr.','.$wgt.')" '.
+ ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
+ $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+ $ctr++;
}
+ $result.='</tr></table>';
-//===================== Script to add keyword(s) ==================
- function getSel() {
- if (document.getSelection) txt = document.getSelection();
- else if (document.selection) txt = document.selection.createRange().text;
- else return;
- var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
- if (cleantxt=="") {
- alert("Select a word or group of words from document and then click this link.");
- return;
+ $result.='</td><td> <b>or</b> </td>';
+ $result.='<td><input type="text" name="GRADE_BOX'.$counter.'"'.
+ ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
+ 'onChange="javascript:updateRadio(this.form.RADVAL'.$counter.
+ ',this.form.GRADE_BOX'.$counter.
+ ',this.form.GRADE_SEL'.$counter.',\''.$wgt.'\')" /></td>'."\n";
+ $result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
+
+ foreach my $part (&getpartlist($url)) {
+ print "parts=$part<br>";
+ my ($temp,$part,$type)=split(/_/,$part);
+ if ($type eq 'solved') {
+ my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);
+ $status = 'partial' if ($foo =~ /partially/);
+ $status = 'nothing' if ($status eq '');
+ $result.='<select name="GRADE_SEL'.$counter.'">'."\n";
+ my $optsel = '<option>correct</option><option>incorrect</option>'.
+ '<option>excused</option><option>ungraded</option>'.
+ '<option>partial</option><option>nothing</option>'."\n";
+ $optsel =~ s/<option>$status/<option selected="on">$status/;
+ $result.=$optsel;
+ $result.="</select>  \n";
}
- var nret = prompt("Add selection to keyword list?",cleantxt);
- if (nret==null) return;
- var curlist = document.SCORE.keywords.value;
- document.SCORE.keywords.value = curlist+" "+nret;
- return;
}
+ $result.='<a href="javascript:msgCenter(document.SCORE,'.$counter.
+ ',\''.$fullname.'\')"; TARGET=_self>Compose Message</a></td></tr></table>'."\n";
+# $result.='</table>';
+ $result.='</td></tr></table></td></tr></table>';
+ $request->print($result);
-//====================== Script for composing message ==============
- function msgCenter(msgform,usrctr,fullname) {
- 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;
-// alert("checked=>"+msgchk);
- re = /msgsub/;
- var shwsel = "";
- if (re.test(msgchk)) { shwsel = "checked" }
- displaySubject(subject,shwsel);
- for (var i=1; i<=Nmsg; i++) {
- var testpt = "savemsg"+i+",";
- re = /testpt/;
- shwsel = "";
- if (re.test(msgchk)) { shwsel = "checked" }
- var message = eval("document.SCORE.savemsg"+i+".value");
- displaySavedMsg(i,message,shwsel);
- }
- newmsg = eval("document.SCORE.newmsg"+usrctr+".value");
- shwsel = "";
- re = /newmsg/;
- if (re.test(msgchk)) { shwsel = "checked" }
- newMsg(newmsg,shwsel);
- msgTail();
- return;
+ # print end of form
+ if ($counter == $total) {
+ my $endform.='<table border="0"><tr><td><input type="submit" name="gradeOpt" value="Save & Next" />';
+ my $ntstu ='<select name="NTSTU">'.
+ '<option>1</option><option>2</option>'.
+ '<option>3</option><option>5</option>'.
+ '<option>7</option><option>10</option></select>'."\n";
+ my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
+ $ntstu =~ s/<option>$nsel/<option selected="on">$nsel/;
+ $endform.=$ntstu.'student(s) ';
+ $endform.='<input type="submit" name="gradeOpt" value="Next" /> ';
+ $endform.='<input type="submit" name="gradeOpt" value="Previous" /> ';
+ $endform.='(Next and Previous do not save the scores.)';
+ $endform.='</td><tr></table></form>';
+ $request->print($endform);
}
-function savedMsgHeader(Nmsg,usrctr,fullname) {
- var height = 30*Nmsg+250;
- var scrollbar = "no";
- if (height > 600) {
- height = 600;
- scrollbar = "yes";
+ return '';
+}
+
+sub get_last_submission {
+ my ($symb,$username,$domain,$course)=@_;
+ if ($symb) {
+ my (@string,@timestamp);
+ my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username);
+ if ($returnhash{'version'}) {
+ my %lasthash=();
+ my ($version);
+ for ($version=1;$version<=$returnhash{'version'};$version++) {
+ foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+ $lasthash{$_}=$returnhash{$version.':'.$_};
+ }
+ }
+ foreach ((keys %lasthash)) {
+ print "lasthash key=$_<br>";
+ if ($_ =~ /\.submission$/) {push @string, $_,$lasthash{$_}}
+ if ($_ =~ /timestamp/) {push @timestamp, scalar(localtime($lasthash{$_}))};
+# if ($_ =~ /\.submission$/) {$string = $lasthash{$_}}
+# if ($_ =~ /timestamp/) {$timestamp=scalar(localtime($lasthash{$_}))};
+ }
}
-/* if (window.pWin)
- window.pWin.close(); */
- pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',width=600,height='+height);
- pWin.document.write("<html><head>");
- pWin.document.write("<title>Message Central</title>");
+ @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
+ return \@string,\@timestamp;
+ }
+}
- 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;");
+sub keywords_highlight {
+ my $string = shift;
+ my $size = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'};
+ my $styleon = $ENV{'form.kwstyle'} eq '' ? '' : $ENV{'form.kwstyle'};
+ (my $styleoff = $styleon) =~ s/\</\<\//;
+ my @keylist = split(/[,\s+]/,$ENV{'form.keywords'});
+ foreach (@keylist) {
+ # next if ($_ eq '');
+ $string =~ s/\b$_(\b|\.)/\<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff\<\/font\>/gi;
+ }
+ return $string;
+}
- 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;");
+sub processHandGrade {
+ my ($request) = shift;
+ my $url = $ENV{'form.url'};
+ my $symb = $ENV{'form.symb'};
+ my $button = $ENV{'form.gradeOpt'};
+ my $ngrade = $ENV{'form.NCT'};
+ my $ntstu = $ENV{'form.NTSTU'};
-// pWin.document.write(" alert(\\"slected=\\"+msgchk)");
- pWin.document.write(" self.close()");
+ my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ my %keyhash = ();
+ $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g;
+ $keyhash{$symb.'_handgrade'} = 'activated';
+ $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'};
+ $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'};
+ $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'};
+ $keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'};
+ $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
- pWin.document.write("}");
+ my ($ctr,$idx) = (1,1);
+ while ($ctr <= $ENV{'form.savemsgN'}) {
+ if ($ENV{'form.savemsg'.$ctr} ne '') {
+ $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
+ $idx++;
+ }
+ $ctr++;
+ }
+ $ctr = 0;
+ while ($ctr < $ngrade) {
+ if ($ENV{'form.newmsg'.$ctr} ne '') {
+ $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+ $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+ $idx++;
+ }
+ $ctr++;
+ }
+ $ENV{'form.savemsgN'} = --$idx;
+ $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
+ my $putresult = &Apache::lonnet::put
+ ('nohist_handgrade',\%keyhash,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
- pWin.document.write("<");
- pWin.document.write("/script>");
+ my (@parts) = sort(&getpartlist($url));
- pWin.document.write("</head><body bgcolor=white>");
+ if ($button eq 'Save & Next') {
+ my $ctr = 0;
+ while ($ctr < $ngrade) {
+ my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
+ &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts);
- 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>");
+ my $includemsg = $ENV{'form.includemsg'.$ctr};
+ my ($subject,$message,$msgstatus) = ('','','');
+ if ($includemsg =~ /savemsg|new$ctr/) {
+ $subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/);
+ my (@msgnum) = split(/,/,$includemsg);
+ foreach (@msgnum) {
+ $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
+ }
+ $message =~ s/\s+/ /g;
+ $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,$ENV{'form.msgsub'},$message);
+ }
+ if ($ENV{'form.collaborator'.$ctr}) {
+ my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
+ foreach (@collaborators) {
+ &saveHandGrade($url,$symb,$_,$udom,$ctr,@parts);
+ if ($message ne '') {
+ $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,$ENV{'form.msgsub'},$message);
+ }
+ }
+ }
+ $ctr++;
+ }
+ }
+ my $firststu = $ENV{'form.unamedom0'};
+ my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
- 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>");
-}
- 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>");
-}
+ my ($classlist) = &getclasslist($ENV{'form.section'},'0');
+ my (@nextlist,@prevlist);
+ my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0);
+ foreach my $student ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) {
+ my ($uname,$udom) = split(/:/,$student);
+ my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname);
+ next if ($status eq 'nothing' && $ENV{'form.submitonly'} eq 'yes');
-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>");
+ if ($nextflg == 1 && $button =~ /Next$/) {
+ push @nextlist,$uname if ($ctr < $ntstu);
+ $ctr++;
+ }
+ $nextflg = 1 if ($student eq $laststu);
+ $prevflg = 1 if ($student eq $firststu);
+ if ($prevflg == 0 && $button eq 'Previous') {
+ push @prevlist,$uname;
+ $ctprev++;
+ }
+ }
+ if ($button eq 'Previous') {
+ if ($ctprev <= $ntstu) {
+ @nextlist = @prevlist;
+ } else {
+ my $idx = 0;
+ my $start = $ctprev - $ntstu;
+ while ($idx < $ntstu) {
+ $nextlist[$idx] = $prevlist[$start+$idx];
+ $idx++;
+ }
+ }
+ }
+ $ctr = 0;
+ my $total = scalar(@nextlist)-1;
+ foreach my $student (@nextlist) {
+ $ENV{'form.student'} = $student;
+ &submission($request,$ctr,$total);
+ $ctr++;
+ }
+ if ($total < 0) {
+ my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";
+ $the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
+ $the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
+ $the_end.=&show_grading_menu_form ($symb,$url);
+ $request->print($the_end);
+ }
+ return '';
}
-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\\" value=\\""+newmsg+" \\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");
-}
+sub saveHandGrade {
+ my ($url,$symb,$stuname,$domain,$newflg,@parts) = @_;
+ my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
+ my %newrecord;
-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>");
+ foreach my $part (@parts) {
+ my ($temp,$part,$type)=split(/_/,$part);
+ my $oldscore=$record{"resource.$part.$type"};
+ my $newscore;
+ if ($type eq 'awarded' && $newflg >= 0) {
+ my $pts = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ?
+ $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg});
+ my $wgt = $ENV{'form.WGT'.$newflg};
+# my $sel = $ENV{'form.GRADE_SEL'.$newflg};
+ $newscore = $pts/$wgt if ($wgt != 0);
+ }
+ if ($type eq 'solved') {
+ $newscore = $ENV{'form.GRADE_SEL'.$newflg} if ($newflg >= 0);
+ my $update=0;
+ if ($newscore eq 'nothing' ) {
+ if ($oldscore ne '') {
+ $update=1;
+ $newscore = '';
+ }
+ } elsif ($oldscore !~ m/^$newscore/) {
+ $update=1;
+ if ($newscore eq 'correct') { $newscore = 'correct_by_override'; }
+ if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; }
+ if ($newscore eq 'excused') { $newscore = 'excused'; }
+ if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; }
+ if ($newscore eq 'partial') { $newscore = 'correct_partially_by_override'; }
+ }
+ if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }
+ } else {
+ if ($oldscore ne $newscore) {
+ $newrecord{"resource.$part.$type"}=$newscore;
+ }
+ }
+ }
+ if ( scalar(keys(%newrecord)) > 0 ) {
+ $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+# while (my ($k,$v) = each %newrecord) {
+# print "k=$k:v=$v:<br>\n";
+# }
+# print "symb=$symb,courseid=$ENV{'request.course.id'},dom=$domain,name=$stuname<br>";
+# &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname);
+ }
+ return '';
}
-//====================== Script for keyword highlight options ==============
- function kwhighlight() {
- var kwclr = document.SCORE.kwclr.value;
- var kwsize = document.SCORE.kwsize.value;
- var kwstyle = document.SCORE.kwstyle.value;
- var redsel = "";
- var grnsel = "";
- var blusel = "";
- if (kwclr=="red") {var redsel="checked"};
- if (kwclr=="green") {var grnsel="checked"};
- if (kwclr=="blue") {var blusel="checked"};
- var sznsel = "";
- var sz1sel = "";
- var sz2sel = "";
- if (kwsize=="0") {var sznsel="checked"};
- if (kwsize=="+1") {var sz1sel="checked"};
- if (kwsize=="+2") {var sz2sel="checked"};
- var synsel = "";
- var syisel = "";
- var sybsel = "";
- if (kwstyle=="") {var synsel="checked"};
- if (kwstyle=="<i>") {var syisel="checked"};
- if (kwstyle=="<b>") {var sybsel="checked"};
- highlightCentral();
- highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel);
- highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel);
- highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel);
- highlightend();
- return;
- }
+sub get_symb_and_url {
+ my ($request) = @_;
+ (my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+ 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 ''; }
+ return ($symb,$url);
+}
+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;
+}
-function highlightCentral() {
- hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300');
- hwdWin.document.write("<html><head>");
- hwdWin.document.write("<title>Highlight Central</title>");
+sub gradingmenu {
+ my ($request) = @_;
+ my ($symb,$url)=&get_symb_and_url($request);
+ if (!$symb) {return '';}
+ my $allkeys = &Apache::lonnet::metadata($url,'keys');
+ my $handgrade = ($allkeys =~ /parameter_.*?_handgrade/ ? 'yes' : 'no');
+ my ($responsetype,$foo) = split(/_/,&Apache::lonnet::metadata($url,'packages'));
+ $allkeys=~s/,/\<br\>/g;
+# print "allkeys=$allkeys<br><br>";
+ $Apache::lonxml::debug=1;
+ &Apache::lonxml::debug(join(':',&Apache::lonnet::metadata($url,'packages')));
+ $Apache::lonxml::debug=0;
- hwdWin.document.write("<script language=javascript>");
- hwdWin.document.write("function updateChoice() {");
- 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(" 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("}");
+ my $result='<h2> <font color="#339933">Select a Grading Method</font></h2>';
+ $result.='<table border="0">';
+ $result.='<tr><td><font size=+1><b>Resource: </b></font></td>'.
+ '<td><font size=+1>'.$url.'</font></td></tr>';
+ $result.='<tr><td><font size=+1><b>Type: </b></font></td>'.
+ '<td><font size=+1>'.$responsetype.' <b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
+ $result.='</table>';
+ my $t0=&Time::HiRes::time();
+ $result.=&view_edit_entire_class_form($symb,$url).'<br />';
+ my $t1=&Time::HiRes::time();
+ print "elapsed10=",$t1-$t0,"<br />";
+ $result.=&upcsvScores_form($symb,$url).'<br />';
+ my $t2=&Time::HiRes::time();
+ print "elapsed21=",$t2-$t1,"<br />";
+ $result.=&viewGradeaStu_form($symb,$url,$responsetype,$handgrade).'<br />';
+ my $t3=&Time::HiRes::time();
+ print "elapsed32=",$t3-$t2,"<br />";
+ $result.=&verifyReceipt_form($symb,$url);
+ my $t4=&Time::HiRes::time();
+ print "elapsed43=",$t4-$t3,"<br />";
+ print "Total elapsed time=",$t4-$t0,"<br />";
+ return $result;
+}
- hwdWin.document.write("<");
- hwdWin.document.write("/script>");
+sub view_edit_entire_class_form {
+ my ($symb,$url)=@_;
+ 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>View/Grade Entire 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>Display students who has: </b>'.
+ '<input type="radio" name="submitonly" value="yes" checked> submitted'.
+ '<input type="radio" name="submitonly" value="all"> everybody <br /><br />';
+ $result.=' <input type="submit" name="submit" value="View/Grade" /></form>'."\n";
+ $result.='</td></tr></table>'."\n";
+ $result.='</td></tr></table>'."\n";
+ return $result;
+}
- hwdWin.document.write("</head><body bgcolor=white>");
+sub upcsvScores_form {
+ my ($symb,$url) = @_;
+ if (!$symb) {return '';}
+ 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>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="submit" name="submit" value="Upload Grades" />
+</form>
+ENDUPFORM
+ $result.='</td></tr></table>'."\n";
+ $result.='</td></tr></table>'."\n";
+ return $result;
+}
- hwdWin.document.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
- hwdWin.document.write("<font color=\\"green\\" size=+1> Keyword Highlight Options</font><br><br>");
+sub viewGradeaStu_form {
+ my ($symb,$url,$response,$handgrade) = @_;
- 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>");
-}
-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>");
- }
+ my $t3=&Time::HiRes::time();
-function highlightend() {
- hwdWin.document.write("</table>");
- hwdWin.document.write("</td></tr></table> ");
- hwdWin.document.write("<input type=\\"button\\" value=\\"Set Options\\" onClick=\\"javascript:updateChoice()\\"> ");
- hwdWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
- hwdWin.document.write("</form>");
- hwdWin.document.write("</body></html>");
-}
+ my ($classlist,$sections) = &getclasslist('all','0');
-</script>
-SUBJAVASCRIPT
-}
- (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) = &finduser($ENV{'form.student'});
- if ($uname eq '') { &moreinfo($request,'Unable to find student'); return ''; }
+ my $t4=&Time::HiRes::time();
+ print "elapsed_getclasslist=",$t4-$t3,"<br />";
- 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' : '');
- # header info
- if ($counter == 0) {
- $request->print('<h2> <font color="#339933">Submission Record</font></h2>'.
- '<font size=+1> <b>Resource: </b>'.$url.'</font>');
- }
+ 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>View/Grade 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="command" value="submission" />'."\n";
- # option to display problem, only once else it cause problems with the form later since the problem has a form.
- if ($ENV{'form.vProb'} eq 'yes' && $counter == 0) {
- my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
- $ENV{'request.course.id'});
- my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
- $ENV{'request.course.id'});
- my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
- $result.='<table border="0" width="100%"><tr><td bgcolor="#e6ffff">';
- $result.='<b>Student\'s view of the problem</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />';
- $result.='<b>Correct answer:</b><br />'.$companswer;
- $result.='</td></tr></table>';
- $result.='</td></tr></table><br />';
- $request->print($result);
+ $result.=' <b>Select section:</b> <select name="section">'."\n";
+ foreach my $section (sort (@$sections)) {
+ $result.= '<option>'.$section.'</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 />';
+ $result.=' (Section "no" implies the students were not assigned a section.)<br />'
+ if (grep /no/,@$sections);
- # beginning of form
- if ($counter == 0) {
- 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'};
- # if the handgrade db has never being initialized then set some default values
- if ($keyhash{$symb.'_handgrade'} eq '') {
- $keyhash{$symb.'_keywords'} = '';
- $keyhash{$symb.'_subject'} = &Apache::lonnet::metadata($url,'title');
- $keyhash{$loginuser.'_kwclr'} = $keyhash{$loginuser.'_kwclr'} eq '' ? 'red' : $keyhash{$loginuser.'_kwclr'};
- $keyhash{$loginuser.'_kwsize'} = $keyhash{$loginuser.'_kwsize'} eq '' ? '0' : $keyhash{$loginuser.'_kwsize'};
- $keyhash{$loginuser.'_kwstyle'} = $keyhash{$loginuser.'_kwstyle'} eq '' ? '' : $keyhash{$loginuser.'_kwstyle'};
- $keyhash{$symb.'_savemsgN'} = '0';
- }
- $request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
- '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
- '<input type="hidden" name="url" value="'.$url.'" />'."\n".
- '<input type="hidden" name="vProb" value="'.$ENV{'form.vProb'}.'" />'."\n".
- '<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="command" value="handgrade" />'."\n".
- '<input type="hidden" name="keywords" value="'.$keyhash{$symb.'_keywords'}.'" />'."\n".
- '<input type="hidden" name="kwclr" value="'.$keyhash{$loginuser.'_kwclr'}.'" />'."\n".
- '<input type="hidden" name="kwsize" value="'.$keyhash{$loginuser.'_kwsize'}.'" />'."\n".
- '<input type="hidden" name="kwstyle" value="'.$keyhash{$loginuser.'_kwstyle'}.'" />'."\n".
- '<input type="hidden" name="msgsub" value="'.$keyhash{$symb.'_subject'}.'" />'."\n".
- '<input type="hidden" name="savemsgN" value="'.$keyhash{$symb.'_savemsgN'}.'" />'."\n".
- '<input type="hidden" name="NCT"'.
- ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
+ $result.='<br /> <input type="submit" name="submit" value="View/Grade" />'."\n".
+ '</form>'."\n";
+ $result.='</td></tr></table>'."\n";
+ $result.='</td></tr></table>'."\n";
+ return $result;
+}
- my ($cts,$prnmsg) = (1,'');
- while ($cts <= $keyhash{$symb.'_savemsgN'}) {
- $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.$keyhash{$symb.'_savemsg'.$cts}.'" />'."\n";
- $cts++;
- }
- $request->print($prnmsg);
+sub verifyReceipt_form {
+ my ($symb,$url) = @_;
+ my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
+ my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
+ my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
- if ($ENV{'form.handgrade'} eq 'yes') {
- $request->print(<<KEYWORDS);
- <b>Keyword Options</b>
-<a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>Keyword List</a>
-<a href="#" onMouseDown="javascript:getSel(); return false"
- CLASS="page">Paste Selection to Keyword list</a>
-<a href="javascript:kwhighlight()"; TARGET=_self>Keyword Highlight Attribute</a><br /><br />
-KEYWORDS
- }
+ my $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">'."\n";
+ $result.=' <tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
+ $result.=' <input type="submit" name="submit" 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'}.'" />';
}
-
- # Student info
- $request->print(($counter == 0 ? '' : '<br /><hr><br />'));
- my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom));
- my $result.='<table border="0"><tr><td><b>Username: </b>'.$uname.
- '</td><td><b>Fullname: </b>'.$fullname.
- '</td><td><b>Domain: </b>'.$udom.'</td></tr>';
- if ($ENV{'form.handgrade'} eq 'yes') {
-# my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'});
- my ($classlist) = &getclasslist('all','0');
- my @collaborators;
-# foreach ( sort(@{ $$classlist{'all'} }) ) {
-# my ($sname,$sdom) = split(/:/);
-# push @collaborators,$sname if (grep /\b$sname(\b|\.)/i,$subonly);
-# }
-# push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators.
- if (scalar(@collaborators) != 0) {
- $result.='<tr><td colspan=3><b>Collaborators: </b>';
- foreach (@collaborators) {
- $result.=$_.' ('.&get_fullname($_,$udom).') ';
- }
- $result.='</td></tr>'."\n";
- $result.='<input type="hidden" name="collaborator'.$counter.
- '" value="'.(join ':',@collaborators).'" />'."\n";
- }
+ if ($ENV{'form.symb'}) {
+ $result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
}
- $result.='</table>'."\n";
- $request->print($result);
+ $result.='</form>';
+ $result.='</td></tr></table>'."\n";
+ $result.='</td></tr></table>'."\n";
+ return $result;
+}
- # print student answer
- if ($ENV{'form.lastSub'} eq 'lastonly') {
- my ($string,$timestamp)=&get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'});
- $string=&keywords_highlight($string);
- my $lastsubonly='<table border="0" width=100%><tr><td bgcolor="#777777">';
- $lastsubonly.='<table border="0" width=100%><tr bgcolor="#e6ffff">';
- $lastsubonly.='<td><b>Last Submission Only</b>'.
- ($timestamp eq '' ? '' : ' <b>Date Submitted:</b> '.$timestamp).'</td></tr>';
- $lastsubonly.='<tr><td bgcolor="#ffffe6">';
- $lastsubonly.=$string;
- $lastsubonly.='</td></tr></table></td></tr></table>'."\n";
- $request->print($lastsubonly);
- } else {
- $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
- $ENV{'request.course.id'},$last,
- '.submission','Apache::grades::keywords_highlight'));
- }
+sub viewgrades {
+ my ($request) = @_;
+ my $result='';
- my $wgt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname);
- my $wgtmsg = ($wgt > 0 ? '(problem weight)' : '<font color="red">problem weight assigned by computer</font>');
- $wgt = ($wgt > 0 ? $wgt : '1');
- my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
- my $score = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt);
+ #get resource reference
+ my ($symb,$url)=&get_symb_and_url($request);
+ if (!$symb) {return '';}
+ #get classlist
+ my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+ #print "Found $cdom:$cnum<br />";
+ my ($classlist) = &getclasslist('all','0');
+ my $headerclr = '"#ddffff"';
+ my $cellclr = '"#ffffdd"';
- # display grading options
- $result='<input type="hidden" name="WGT'.$counter.'" value="'.$wgt.'" />'.
- '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'.$udom.'" />'."\n";
- $result.='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
- $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n";
- $result.='<table border="0"><tr><td><b>Points</b></td><td>';
+ #get list of parts for this problem
+ my (@parts) = sort(&getpartlist($url));
- my $ctr = 0;
- $result.='<table border="0"><tr>'; # display radio buttons in a nice table with 10 across
- while ($ctr<=$wgt) {
- $result.= '<td><input type="radio" name="RADVAL'.$counter.'" '.
- 'onclick="javascript:writeBox(this.form.GRADE_BOX'.$counter.
- ',this.form.GRADE_SEL'.$counter.','.$ctr.','.$wgt.')" '.
- ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
- $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
- $ctr++;
- }
- $result.='</tr></table>';
+ $request->print ("<h2><font color=\"#339933\">Manual Grading</font></h2>");
- $result.='</td><td> <b>or</b> </td>';
- $result.='<td><input type="text" name="GRADE_BOX'.$counter.'"'.
- ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
- 'onChange="javascript:updateRadio(this.form.RADVAL'.$counter.
- ',this.form.GRADE_BOX'.$counter.
- ',this.form.GRADE_SEL'.$counter.',\''.$wgt.'\')" /></td>'."\n";
- $result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
-
- foreach my $part (&getpartlist($url)) {
- my ($temp,$part,$type)=split(/_/,$part);
- if ($type eq 'solved') {
- my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);
- $status = 'partial' if ($foo =~ /partially/);
- $status = 'nothing' if ($status eq '');
- $result.='<select name="GRADE_SEL'.$counter.'">'."\n";
- my $optsel = '<option>correct</option><option>incorrect</option>'.
- '<option>excused</option><option>ungraded</option>'.
- '<option>partial</option><option>nothing</option>'."\n";
- $optsel =~ s/<option>$status/<option selected="on">$status/;
- $result.=$optsel;
- $result.="</select>  \n";
- $result.='<a href="javascript:msgCenter(document.SCORE,'.$counter.
- ',\''.$fullname.'\')"; TARGET=_self>Compose Message</a></td></tr>'."\n";
- }
+ #start the form
+ $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="editgrades" />'."\n".
+ '<input type="submit" name="submit" value="Submit Changes" />'."\n".
+ '<table border=0><tr><td bgcolor="#777777">'."\n".
+ '<table border=0>'."\n".
+ '<tr bgcolor='.$headerclr.'><td><b>Username</b></td><td><b>Fullname</b></td><td><b>Domain</b></td>'."\n";
+ foreach my $part (@parts) {
+ my $display=&Apache::lonnet::metadata($url,$part.'.display');
+ if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
+ $result.='<td><b>'.$display.'</b></td>'."\n";
}
- $result.='</table>';
- $request->print($result);
-
- # print end of form
- if ($counter == $total) {
- my $endform.='<table border="0"><tr><td><input type="submit" name="gradeOpt" value="Save & Next" />';
- my $ntstu ='<select name="NTSTU">'.
- '<option>1</option><option>2</option>'.
- '<option>3</option><option>5</option>'.
- '<option>7</option><option>10</option></select>'."\n";
- my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
- $ntstu =~ s/<option>$nsel/<option selected="on">$nsel/;
- $endform.=$ntstu.'student(s) ';
- $endform.='<input type="submit" name="gradeOpt" value="Next" /> ';
- $endform.='<input type="submit" name="gradeOpt" value="Previous" /> ';
- $endform.='(Next and Previous do not save the scores.)';
- $endform.='</td><tr></table></form>';
- $request->print($endform);
+ $result.='</tr>';
+ #get info for each student
+ foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
+# my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
+# print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:<br>\n";
+ $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
}
- return '';
+ $result.='</table></td></tr></table>';
+ $result.='<input type="submit" name="submit" value="Submit Changes" /></form>';
+ $result.=&show_grading_menu_form($symb,$url);
+ return $result;
}
-sub get_last_submission {
- my ($symb,$username,$domain,$course)=@_;
- if ($symb) {
- my ($string,$timestamp);
- my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username);
- if ($returnhash{'version'}) {
- my %lasthash=();
- my ($version);
- for ($version=1;$version<=$returnhash{'version'};$version++) {
- foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
- $lasthash{$_}=$returnhash{$version.':'.$_};
- }
- }
- foreach ((keys %lasthash)) {
- if ($_ =~ /\.submission$/) {$string = $lasthash{$_}}
- if ($_ =~ /timestamp/) {$timestamp=scalar(localtime($lasthash{$_}))};
- }
- }
- $string = $string eq '' ? 'Nothing submitted - no attempts.' : $string;
- return $string,$timestamp;
- }
-}
+sub editgrades {
+ my ($request) = @_;
+ my $result='';
-sub keywords_highlight {
- my $string = shift;
- (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
- my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
- my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ my $symb=$ENV{'form.symb'};
+ if ($symb eq '') { $request->print("Unable to handle ambiguous references:$symb:$ENV{'form.url'}"); return ''; }
+ my $url=$ENV{'form.url'};
+ #get classlist
+# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+ #print "Found $cdom:$cnum<br />";
+ my ($classlist) = &getclasslist('all','0');
- my @kwkeys = ($symb.'_keywords',
- $loginuser.'_kwclr',
- $loginuser.'_kwsize',
- $loginuser.'_kwstyle'
- );
+ #get list of parts for this problem
+ my (@parts) = &getpartlist($url);
- my %keyhash = &Apache::lonnet::get
- ('nohist_handgrade',\@kwkeys,
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
- my @keylist = split(/[,\s+]/,$keyhash{$symb.'_keywords'});
- my $size = $keyhash{$kwkeys[2]} eq '0' ? '' : 'size='.$keyhash{$kwkeys[2]};
- my $styleon = $keyhash{$kwkeys[3]} eq '' ? '' : $keyhash{$kwkeys[3]};
- (my $styleoff = $styleon) =~ s/\</\<\//;
- foreach my $word (@keylist) {
- next if ($word eq '');
- $string =~ s/\b$word(\b|\.)/\<font color\=$keyhash{$kwkeys[1]} $size\>$styleon$word$styleoff\<\/font\>/gi;
+ $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".
+ '<input type="submit" name="submit" value="See Grades" /> <br />'."\n";
+
+ foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
+ $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
}
- return $string;
-}
-sub processHandGrade {
- my ($request) = shift;
- my $url = $ENV{'form.url'};
- my $symb = $ENV{'form.symb'};
- my $button = $ENV{'form.gradeOpt'};
- my $ngrade = $ENV{'form.NCT'};
- my $ntstu = $ENV{'form.NTSTU'};
+ $result.='<input type="submit" name="submit" value="See Grades" /></table></form>';
+ return $result;
+}
- my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
- my %keyhash = ();
- $keyhash{$symb.'_handgrade'} = 'activated';
- $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'};
- $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'};
- $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'};
- $keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'};
- $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
+sub sub_page_js {
+ my $request = shift;
+ $request->print(<<SUBJAVASCRIPT);
+<script type="text/javascript" language="javascript">
+ function updateRadio(radioButton,formtextbox,formsel,wgt) {
+ var pts = formtextbox.value;
+ var resetbox =false;
+ if (isNaN(pts) || pts < 0) {
+ alert("A number equal or greater than 0 is expected. Entered value = "+pts);
+ for (var i=0; i<radioButton.length; i++) {
+ if (radioButton[i].checked) {
+ formtextbox.value = i;
+ resetbox = true;
+ }
+ }
+ if (!resetbox) {
+ formtextbox.value = "";
+ }
+ return;
+ }
- my ($ctr,$idx) = (1,1);
- while ($ctr <= $ENV{'form.savemsgN'}) {
- if ($ENV{'form.savemsg'.$ctr} ne '') {
- $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
- $idx++;
- }
- $ctr++;
- }
- $ctr = 0;
- while ($ctr < $ngrade) {
- if ($ENV{'form.newmsg'.$ctr} ne '') {
- $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
- $idx++;
- }
- $ctr++;
+ for (var i=0; i<radioButton.length; i++) {
+ radioButton[i].checked=false;
+ if (pts == i) {
+ radioButton[i].checked=true;
+ }
+ }
+ updateSelect(formsel,pts,wgt);
}
- $keyhash{$symb.'_savemsgN'} = --$idx;
- my $putresult = &Apache::lonnet::put
- ('nohist_handgrade',\%keyhash,
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
- my (@parts) = sort(&getpartlist($url));
-
- if ($button eq 'Save & Next') {
- my $ctr = 0;
- while ($ctr < $ngrade) {
- my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
- &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts);
- if ($ENV{'form.collaborator'.$ctr}) {
- my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
- foreach (@collaborators) {
- &saveHandGrade($url,$symb,$_,$udom,$ctr,@parts);
- }
- }
- $ctr++;
- }
+ function writeBox(formrad,formsel,pts,wgt) {
+ formrad.value = pts;
+ updateSelect(formsel,pts,wgt);
+ return;
}
- my $firststu = $ENV{'form.unamedom0'};
- my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
- my ($classlist) = &getclasslist($ENV{'form.section'},'0');
-# print "first=$firststu,last=$laststu<br>";
- my (@nextlist,@prevlist);
- my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0);
- foreach my $student ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) {
- my ($uname,$udom) = split(/:/,$student);
- my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname);
- next if ($status eq 'nothing' && $ENV{'form.submitonly'} eq 'yes');
+ function updateSelect(formsel,pts,wgt) {
+ if (pts == 0) {
+ formsel[1].selected = true;
+ }
+ if (pts > 0 && pts < wgt) {
+ formsel[4].selected = true;
+ }
+ if (pts == wgt) {
+ formsel[0].selected = true;
+ }
+ return;
+ }
- if ($nextflg == 1 && $button =~ /Next$/) {
- push @nextlist,$uname if ($ctr < $ntstu);
- $ctr++;
- }
- $nextflg = 1 if ($student eq $laststu);
- $prevflg = 1 if ($student eq $firststu);
- if ($prevflg == 0 && $button eq 'Previous') {
- push @prevlist,$uname;
- $ctprev++;
- }
+ function keywords(keyform) {
+ var keywds = keyform.value;
+ var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keywds);
+ if (nret==null) return;
+ keyform.value = nret;
+ return;
}
-# print "next student=@nextlist<br>";
- if ($button eq 'Previous') {
- if ($ctprev <= $ntstu) {
- @nextlist = @prevlist;
- } else {
- my $idx = 0;
- my $start = $ctprev - $ntstu;
- while ($idx < $ntstu) {
- $nextlist[$idx] = $prevlist[$start+$idx];
- $idx++;
- }
- }
+
+//===================== Script to add keyword(s) ==================
+ function getSel() {
+ if (document.getSelection) txt = document.getSelection();
+ else if (document.selection) txt = document.selection.createRange().text;
+ else return;
+ var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
+ if (cleantxt=="") {
+ alert("Select a word or group of words from document and then click this link.");
+ return;
+ }
+ 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;
+ return;
}
- $ctr = 0;
- my $total = scalar(@nextlist)-1;
- foreach my $student (@nextlist) {
- $ENV{'form.student'} = $student;
- &submission($request,$ctr,$total);
- $ctr++;
+
+//====================== Script for composing message ==============
+ function msgCenter(msgform,usrctr,fullname) {
+ 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;
+// alert("checked=>"+msgchk);
+ re = /msgsub/;
+ var shwsel = "";
+ if (re.test(msgchk)) { shwsel = "checked" }
+ displaySubject(subject,shwsel);
+ for (var i=1; i<=Nmsg; i++) {
+ var testpt = "savemsg"+i+",";
+ re = /testpt/;
+ shwsel = "";
+ if (re.test(msgchk)) { shwsel = "checked" }
+ var message = eval("document.SCORE.savemsg"+i+".value");
+ displaySavedMsg(i,message,shwsel);
+ }
+ newmsg = eval("document.SCORE.newmsg"+usrctr+".value");
+ shwsel = "";
+ re = /newmsg/;
+ if (re.test(msgchk)) { shwsel = "checked" }
+ newMsg(newmsg,shwsel);
+ msgTail();
+ return;
}
- return 'The End';
-}
+ function savedMsgHeader(Nmsg,usrctr,fullname) {
+ var height = 30*Nmsg+250;
+ var scrollbar = "no";
+ if (height > 600) {
+ height = 600;
+ scrollbar = "yes";
+ }
+/* 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>");
-sub saveHandGrade {
- my ($url,$symb,$stuname,$domain,$newflg,@parts) = @_;
- my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
- my %newrecord;
+ 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;");
- foreach my $part (@parts) {
- my ($temp,$part,$type)=split(/_/,$part);
- my $oldscore=$record{"resource.$part.$type"};
- my $newscore;
- if ($type eq 'awarded' && $newflg >= 0) {
- my $pts = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ?
- $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg});
- my $wgt = $ENV{'form.WGT'.$newflg};
-# my $sel = $ENV{'form.GRADE_SEL'.$newflg};
- $newscore = $pts/$wgt if ($wgt != 0);
- }
- if ($type eq 'solved') {
- $newscore = $ENV{'form.GRADE_SEL'.$newflg} if ($newflg >= 0);
- my $update=0;
- if ($newscore eq 'nothing' ) {
- if ($oldscore ne '') {
- $update=1;
- $newscore = '';
- }
- } elsif ($oldscore !~ m/^$newscore/) {
- $update=1;
- if ($newscore eq 'correct') { $newscore = 'correct_by_override'; }
- if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; }
- if ($newscore eq 'excused') { $newscore = 'excused'; }
- if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; }
- if ($newscore eq 'partial') { $newscore = 'correct_partially_by_override'; }
- }
- if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }
- } else {
- if ($oldscore ne $newscore) {
- $newrecord{"resource.$part.$type"}=$newscore;
- }
- }
- }
- if ( scalar(keys(%newrecord)) > 0 ) {
- $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
-# while (my ($k,$v) = each %newrecord) {
-# print "k=$k:v=$v:<br>\n";
-# }
-# print "symb=$symb,courseid=$ENV{'request.course.id'},dom=$domain,name=$stuname<br>";
-# &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname);
- }
- return '';
-}
+ 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;");
-sub get_symb_and_url {
- my ($request) = @_;
- (my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
- 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 ''; }
- return ($symb,$url);
-}
+// pWin.document.write(" alert(\\"slected=\\"+msgchk)");
+ pWin.document.write(" self.close()");
-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;
-}
+ pWin.document.write("}");
-sub gradingmenu {
- my ($request) = @_;
- my ($symb,$url)=&get_symb_and_url($request);
- if (!$symb) {return '';}
- my $allkeys = &Apache::lonnet::metadata($url,'keys');
- my $handgrade = ($allkeys =~ /parameter_.*?_handgrade/ ? 'yes' : 'no');
- my ($responsetype,$foo) = split(/_/,&Apache::lonnet::metadata($url,'packages'));
+ pWin.document.write("<");
+ pWin.document.write("/script>");
- my $result='<h2> <font color="#339933">Select a Grading Method</font></h2>';
- $result.='<table border="0">';
- $result.='<tr><td><font size=+1><b>Resource: </b></font></td>'.
- '<td><font size=+1>'.$url.'</font></td></tr>';
- $result.='<tr><td><font size=+1><b>Type: </b></font></td>'.
- '<td><font size=+1>'.$responsetype.' <b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
- $result.='</table>';
+ pWin.document.write("</head><body bgcolor=white>");
- $result.=&view_edit_entire_class_form($symb,$url).'<br />';
- $result.=&upcsvScores_form($symb,$url).'<br />';
- $result.=&viewGradeaStu_form($symb,$url,$responsetype,$handgrade).'<br />';
- $result.=&verifyReceipt_form($symb,$url);
- return $result;
-}
+ 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>");
-sub view_edit_entire_class_form {
- my ($symb,$url)=@_;
- 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>View/Grade Entire 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>Display students who has: </b>'.
- '<input type="radio" name="submitonly" value="yes" checked> submitted'.
- '<input type="radio" name="submitonly" value="all"> everybody <br /><br />';
- $result.=' <input type="submit" name="submit" value="View/Grade" /></form>'."\n";
- $result.='</td></tr></table>'."\n";
- $result.='</td></tr></table>'."\n";
- return $result;
+ 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>");
}
-
-sub upcsvScores_form {
- my ($symb,$url) = @_;
- if (!$symb) {return '';}
- 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>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="submit" name="submit" value="Upload Grades" />
-</form>
-ENDUPFORM
- $result.='</td></tr></table>'."\n";
- $result.='</td></tr></table>'."\n";
- return $result;
+ 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>");
}
-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>View/Grade 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="command" value="submission" />'."\n";
-
- $result.=' <b>Select section:</b> <select name="section">'."\n";
- foreach my $section (sort (@$sections)) {
- $result.= '<option>'.$section.'</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 />';
- $result.=' (Section "no" implies the students were not assigned a section.)<br />'
- if (grep /no/,@$sections);
+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>");
+}
- $result.='<br /> <input type="submit" name="submit" value="View/Grade" />'."\n".
- '</form>'."\n";
- $result.='</td></tr></table>'."\n";
- $result.='</td></tr></table>'."\n";
- return $result;
+ 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\\" value=\\""+newmsg+" \\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");
}
-sub verifyReceipt_form {
- my ($symb,$url) = @_;
- my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
- my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
- my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
+ 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>");
+}
- my $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">'."\n";
- $result.=' <tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
- $result.=' <input type="submit" name="submit" 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'}.'" />';
- }
- if ($ENV{'form.symb'}) {
- $result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
+//====================== Script for keyword highlight options ==============
+ function kwhighlight() {
+ var kwclr = document.SCORE.kwclr.value;
+ var kwsize = document.SCORE.kwsize.value;
+ var kwstyle = document.SCORE.kwstyle.value;
+ var redsel = "";
+ var grnsel = "";
+ var blusel = "";
+ if (kwclr=="red") {var redsel="checked"};
+ if (kwclr=="green") {var grnsel="checked"};
+ if (kwclr=="blue") {var blusel="checked"};
+ var sznsel = "";
+ var sz1sel = "";
+ var sz2sel = "";
+ if (kwsize=="0") {var sznsel="checked"};
+ if (kwsize=="+1") {var sz1sel="checked"};
+ if (kwsize=="+2") {var sz2sel="checked"};
+ var synsel = "";
+ var syisel = "";
+ var sybsel = "";
+ if (kwstyle=="") {var synsel="checked"};
+ if (kwstyle=="<i>") {var syisel="checked"};
+ if (kwstyle=="<b>") {var sybsel="checked"};
+ highlightCentral();
+ highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel);
+ highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel);
+ highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel);
+ highlightend();
+ return;
}
- $result.='</form>';
- $result.='</td></tr></table>'."\n";
- $result.='</td></tr></table>'."\n";
- return $result;
-}
-sub viewgrades {
- my ($request) = @_;
- my $result='';
- #get resource reference
- my ($symb,$url)=&get_symb_and_url($request);
- if (!$symb) {return '';}
- #get classlist
- my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
- #print "Found $cdom:$cnum<br />";
- my ($classlist) = &getclasslist('all','0');
- my $headerclr = '"#ccffff"';
- my $cellclr = '"#ffffcc"';
+ function highlightCentral() {
+ 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>");
- #get list of parts for this problem
- my (@parts) = sort(&getpartlist($url));
+ hwdWin.document.write("<script language=javascript>");
+ hwdWin.document.write("function updateChoice() {");
+ 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(" self.close()");
+ hwdWin.document.write("}");
- $request->print ("<h2><font color=\"#339933\">Manual Grading</font></h2>");
+ 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("}");
- #start the form
- $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="editgrades" />'."\n".
- '<input type="submit" name="submit" value="Submit Changes" />'."\n".
- '<table border=0><tr><td bgcolor="#777777">'."\n".
- '<table border=0>'."\n".
- '<tr bgcolor='.$headerclr.'><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td>'."\n";
- foreach my $part (@parts) {
- my $display=&Apache::lonnet::metadata($url,$part.'.display');
- if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
- $result.='<td><b>'.$display.'</b></td>'."\n";
- }
- $result.='</tr>';
- #get info for each student
- foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
- my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
-# print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:<br>\n";
- $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
- }
- $result.='</table></td></tr></table>';
- $result.='<input type="submit" name="submit" value="Submit Changes" /></form>';
- $result.=&show_grading_menu_form($symb,$url);
- return $result;
-}
+ hwdWin.document.write("<");
+ hwdWin.document.write("/script>");
-sub editgrades {
- my ($request) = @_;
- my $result='';
+ hwdWin.document.write("</head><body bgcolor=white>");
- my $symb=$ENV{'form.symb'};
- if ($symb eq '') { $request->print("Unable to handle ambiguous references:$symb:$ENV{'form.url'}"); return ''; }
- my $url=$ENV{'form.url'};
- #get classlist
-# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
- #print "Found $cdom:$cnum<br />";
- my ($classlist) = &getclasslist('all','0');
+ hwdWin.document.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
+ hwdWin.document.write("<font color=\\"green\\" size=+1> Keyword Highlight Options</font><br><br>");
- #get list of parts for this problem
- my (@parts) = &getpartlist($url);
+ 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>");
+ }
- $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".
- '<input type="submit" name="submit" value="See Grades" /> <br />'."\n";
+ 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>");
+ }
- foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
- $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
+ function highlightend() {
+ hwdWin.document.write("</table>");
+ hwdWin.document.write("</td></tr></table> ");
+ hwdWin.document.write("<input type=\\"button\\" value=\\"Set Options\\" onClick=\\"javascript:updateChoice()\\"> ");
+ hwdWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+ hwdWin.document.write("</form>");
+ hwdWin.document.write("</body></html>");
}
- $result.='<input type="submit" name="submit" value="See Grades" /></table></form>';
- return $result;
+</script>
+SUBJAVASCRIPT
}
sub csvupload_javascript_reverse_associate {
--ng1026335319--