--- loncom/homework/grades.pm 2002/06/20 22:04:21 1.29
+++ loncom/homework/grades.pm 2002/06/27 21:34:18 1.33
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.29 2002/06/20 22:04:21 albertel Exp $
+# $Id: grades.pm,v 1.33 2002/06/27 21:34:18 ng Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +29,9 @@
# 6/8 Gerd Kortemeyer
# 7/26 H.K. Ng
# 8/20 Gerd Kortemeyer
+# Year 2002
+# June 2002 H.K. Ng
+#
package Apache::grades;
use strict;
@@ -83,12 +86,13 @@ sub verifyreceipt {
$matches++;
}
}
- $request->print('<p>'.$matches.' match(es)</p>');
+ $request->printf('<p>'.$matches." match%s</p>",$matches <= 1 ? '' : 'es');
+# needs to print who is matched
}
return '';
}
-sub listStudents {
+sub receiptInput {
my ($request) = shift;
my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
@@ -108,13 +112,40 @@ ENDHEADER
$request->print(
'<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');
}
+# $request->print(<<ENDTABLEST);
+ $request->print('</form>');
+ return '';
+}
+
+sub student_gradeStatus {
+ my ($url,$udom,$uname) = @_;
+ my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
+ my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+ 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 = 'nothing' if ($status eq '');
+ return $type,$status;
+ }
+ }
+ return '';
+}
+
+sub listStudents {
+ my ($request) = shift;
+ my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
+ my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
+
$request->print(<<ENDTABLEST);
-</form>
<h2><font color="#339933">Show Student Submissions on Assessment</font></h2>
-<table border="0"><tr><td bgcolor="#000000">
+<table border="0"><tr><td bgcolor="#777777">
<table border="0">
-<tr bgcolor="#e6ffff"><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td><td> </td></tr>
+<tr bgcolor="#e6ffff"><td colspan="7"><b>Resource: </b> $ENV{'form.url'}</td></tr>
+<tr bgcolor="#e6ffff"><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td>
+<td><b>View Problem</b></td><td><b>Submissions</b></td>
+<td><b>Grade Status</b></td><td><b>Action</b></td></tr>
ENDTABLEST
my (%classlist) = &getclasslist($cdom,$cnum,'0');
foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
@@ -131,26 +162,35 @@ ENDTABLEST
$fullname.=$name{'firstname'}.' '.$name{'middlename'};
}
if ( $Apache::grades::viewgrades eq 'F' ) {
- $request->print("\n".'<tr bgcolor=#ffffe6>'."<td>$sname</td><td>$fullname</td><td>$sdom</td><td>".
+ $request->print("\n".'<tr bgcolor=#ffffe6>'."<td>$sname</td><td>$fullname</td><td align=\"middle\">$sdom</td>".
'<form action="/adm/grades" method="post">');
if ($ENV{'form.url'}) {
$request->print(
- '<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />');
+ '<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />');
}
if ($ENV{'form.symb'}) {
$request->print(
- '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');
+ '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');
}
$request->print(
- '<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />');
+ '<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />');
$request->print(
- '<input type="hidden" name="student" value="'.$sname.'" />');
+ '<input type="hidden" name="student" value="'.$sname.'" />');
$request->print(
- '<input type="hidden" name="fullname" value="'.$fullname.'" />');
+ '<input type="hidden" name="fullname" value="'.$fullname.'" />');
$request->print(
- '<input type="hidden" name="domain" value="'.$sdom.'" />');
+ '<input type="hidden" name="domain" value="'.$sdom.'" />');
+ $request->print('<td>'.
+ '<input type="radio" name="vProb" value="no" checked> no '.
+ '<input type="radio" name="vProb" value="yes"> yes </td>');
+ $request->print('<td>'.
+ '<input type="radio" name="lastSub" value="last" checked> last '.
+ '<input type="radio" name="lastSub" value="all"> all </td>');
+ my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname);
$request->print(
- '<input type="submit" name="submit" value="View" />');
+ '<td align="middle">'.$status.' </td>');
+ $request->print(
+ '<td><input type="submit" name="submit" value="View/Grade" />');
$request->print('</td></tr></form>');
# $request->print('</form></td></tr>');
}
@@ -201,7 +241,7 @@ sub getpartlist {
my @parts =();
my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
foreach my $key (@metakeys) {
- if ( $key =~ m/stores_([0-9]+)_.*/ ) {
+ if ( $key =~ m/stores_([0-9]+)_.*/) {
push(@parts,$key);
}
}
@@ -217,6 +257,7 @@ sub viewstudentgrade {
my (@requests) = ('lastname','firstname','middlename','generation');
my (%name) = &Apache::lonnet::get('environment',\@requests,$domain,$username);
my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username);
+
my $fullname=$name{'lastname'}.$name{'generation'};
if ($fullname =~ /[^\s]+/) { $fullname.=', '; }
$fullname.=$name{'firstname'}.' '.$name{'middlename'};
@@ -224,50 +265,40 @@ sub viewstudentgrade {
$result.="<tr bgcolor=$cellclr><td>$username</td><td>$fullname</td><td align=\"middle\">$domain</td>\n";
foreach my $part (@parts) {
my ($temp,$part,$type)=split(/_/,$part);
- #print "resource.$part.$type = ".$record{"resource.$part.$type"}." <br />\n";
- if ($type eq 'awarded') {
- my $score=$record{"resource.$part.$type"};
- $result.="<td align=\"middle\"><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n";
- } elsif ($type eq 'tries') {
- my $score=$record{"resource.$part.$type"};
- $result.="<td align=\"middle\"><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n"
+ my $score=$record{"resource.$part.$type"};
+ if ($type eq 'awarded' || $type eq 'tries') {
+ $result.='<td align="middle"><input type="text" name="GRADE.'.$student.'.'.$part.'.'.$type.
+ '" value="'.$score.'" size="4" /></td>'."\n";
} elsif ($type eq 'solved') {
- my $score=$record{"resource.$part.$type"};
+ my ($status,$foo)=split(/_/,$score,2);
$result.="<td align=\"middle\"><select name=\"GRADE.$student.$part.$type\">\n";
- if ($score =~ /^correct/) {
- $result.="<option selected=\"on\">correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
- } elsif ($score =~ /^incorrect/) {
- $result.="<option>correct</option>\n<option selected=\"on\">incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
- } elsif ($score eq '') {
- $result.="<option>correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option selected=\"on\">nothing</option>\n";
- } elsif ($score =~ /^excused/) {
- $result.="<option>correct</option>\n<option>incorrect</option>\n<option selected=\"on\">excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
- } elsif ($score =~ /^ungraded/) {
- $result.="<option>correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option selected=\"on\">ungraded</option>\n<option>nothing</option>\n";
- }
+ my $optsel = '<option>correct</option><option>incorrect</option><option>excused</option>'.
+ '<option>ungraded</option><option>partial</option><option>nothing</option>'."\n";
+ $status = 'nothing' if ($status eq '');
+ $optsel =~ s/<option>$status/<option selected="on">$status/;
+ $result.=$optsel;
$result.="</select></td>\n";
}
}
$result.='<td></td></tr>';
return $result;
}
-#FIXME need to look at the meatdata <stores> spec on what type of data to accept and provide an
+
+#FIXME need to look at the metadata <stores> spec on what type of data to accept and provide an
#interface based on that, also do that to above function.
sub setstudentgrade {
my ($url,$symb,$courseid,$student,@parts) = @_;
my $result ='';
-
my ($stuname,$domain) = split(/:/,$student);
-
my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
-
my %newrecord;
foreach my $part (@parts) {
my ($temp,$part,$type)=split(/_/,$part);
my $oldscore=$record{"resource.$part.$type"};
my $newscore=$ENV{"form.GRADE.$student.$part.$type"};
+ print "old=$oldscore:new=$newscore:<br>";
if ($type eq 'solved') {
my $update=0;
if ($newscore eq 'nothing' ) {
@@ -296,7 +327,11 @@ sub setstudentgrade {
}
}
if ( scalar(keys(%newrecord)) > 0 ) {
- $newrecord{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ print "grader=$newrecord{'resource.regrader'}:<br>records<br>";
+ while (my ($k,$v) = each %newrecord) {
+ print "k=$k:v=$v:<br>\n";
+ }
&Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
$result.="Stored away ".scalar(keys(%newrecord))." elements.<br />\n";
@@ -304,41 +339,267 @@ sub setstudentgrade {
return $result;
}
+#
+# --------------------------- show submissions of a student, option to grade --------
sub submission {
my ($request) = @_;
- my $url=$ENV{'form.url'};
- $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+
+ $request->print(<<JAVASCRIPT);
+<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;
+ }
+
+ for (var i=0; i<radioButton.length; i++) {
+ radioButton[i].checked=false;
+ if (pts == i) {
+ radioButton[i].checked=true;
+ }
+ }
+ updateSelect(formsel,pts,wgt);
+ }
+
+ function writeBox(formrad,formsel,pts,wgt) {
+ formrad.value = pts;
+ updateSelect(formsel,pts,wgt);
+ return;
+ }
+
+ 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;
+ }
+
+</script>
+JAVASCRIPT
+ (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 ''; }
-# if ($ENV{'form.student'} eq '') { &listStudents($request); return ''; }
+ print "formstu=$ENV{'form.student'}:<br>";
my ($uname,$udom) = &finduser($ENV{'form.student'});
if ($uname eq '') { &moreinfo($request,"Unable to find student"); return ''; }
- my $symb;
- if ($ENV{'form.symb'}) {
- $symb=$ENV{'form.symb'};
- } else {
- $symb=&Apache::lonnet::symbread($url);
- }
+
+ 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 $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
- $ENV{'request.course.id'});
+#
+# header info
my $result='<h2><font color="#339933">Submission Record</font></h2>';
- $result.='<b>Username : </b>'.$uname.'<br><b>Fullname : </b>'.$ENV{'form.fullname'}.'<br><b>Domain : </b>'.$udom.'<br><b>Resource : </b>'.$url.' <br />'.$answer;
- my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+ $result.='<table border="0"><tr><td><b>Username: </b>'.$uname.
+ '</td><td><b>Fullname: </b>'.$ENV{'form.fullname'}.'</td><td><b>Domain: </b>'.$udom.'</td></tr>';
+ $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>';
+#
+# option to display problem
+ if ($ENV{'form.vProb'} eq 'yes') {
+ my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
$ENV{'request.course.id'});
- $result.="Student's view of the problem:<br /> $rendered <br /> Correct answer:<br />";
-
- $answer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
- $ENV{'request.course.id'});
+ my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+ $ENV{'request.course.id'});
+ $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 />';
+ }
+ my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+ my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
+ $ENV{'request.course.id'},$last);
$result.=$answer;
+
+ my $wgt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname);
+ my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+ my $score = $record{'resource.0.awarded'}*$wgt;
+
+ $result.= '<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="'.$last.'" />'."\n".
+ '<input type="hidden" name="command" value="handgrade" />'."\n".
+ '<input type="hidden" name="NCT"'.
+ ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1').'" />'."\n";
+
+ my $counter = 0;
+ $result.='<input type="hidden" name="WGT'.$counter.'" value="'.$wgt.'" />'.
+ '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'.$udom.'" />'."\n";
+ $result.='<table border="0"><tr><td><b>Points</b></td><td>';
+ my $ctr = 0;
+ while ($ctr<=$wgt) {
+ $result.= '<input type="radio" name="RADVAL'.$counter.'" '.
+ 'onclick="javascript:writeBox(this.form.GRADE_BOX'.$counter.
+ ',this.form.GRADE_SEL'.$counter.',\''.$ctr.'\',\''.$wgt.'\')" '.
+ ($score == $ctr? 'checked':'').' /> '.$ctr."\n";
+ $ctr++;
+ }
+ $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 > 0 ? $wgt.' (problem weight)' : '<font color="red">invalid problem weight</font>' ).
+ ' </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);
+ $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";
+ $status = 'nothing' if ($status eq '');
+ $optsel =~ s/<option>$status/<option selected="on">$status/;
+ $result.=$optsel;
+ $result.="</select></td></tr>\n";
+ }
+ }
+
+ $result.='<tr><td colspan="6"><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/;
+ $result.=$ntstu.'student(s) '."\n <br />";
+ $result.='<input type="submit" name="gradeOpt" value="Next" /> ';
+ $result.='<input type="submit" name="gradeOpt" value="Previous" /> ';
+ $result.='(Next and Previous do not save the scores.)';
+ $result.='</td><tr></table></form>';
return $result;
}
+sub processHandGrade {
+ my ($request) = @_;
+ my $result='';
+
+ 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'};
+ my $vProb = $ENV{'form.vProb'};
+ my $lastSub= $ENV{'form.lastSub'};
+
+ my (@parts) = sort(&getpartlist($url));
+ if ($button eq 'Save & Next') {
+ my $ctr = 0;
+ while ($ctr < $ENV{'form.NCT'}) {
+ my $pts = ($ENV{'form.GRADE_BOX'.$ctr} ne '' ? $ENV{'form.GRADE_BOX'.$ctr} : $ENV{'form.RADVAL'.$ctr});
+ my $wgt = $ENV{'form.WGT'.$ctr};
+ my $sel = $ENV{'form.GRADE_SEL'.$ctr};
+ my $score = $pts/$wgt if ($wgt != 0);
+ my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
+ &saveHandGrade($url,$symb,$uname,$udom,$score,@parts);
+ $ctr++;
+ }
+ }
+ my $firststu = $ENV{'form.unamedom0'};
+ my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
+
+ #get classlist
+ my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+ my (%classlist) = &getclasslist($cdom,$cnum,'0');
+
+ my (@nextlist,@prevlist);
+ my ($nextflg,$prevflg,$ctr) = (0,0,0);
+ foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ my ($uname,$udom) = split(/:/,$student);
+ if ($nextflg == 1 && $button =~ /Next$/) {
+ push @nextlist,$uname if ($ctr < $ENV{'form.NTSTU'});
+ $ctr++;
+ }
+ $nextflg = 1 if ($student eq $laststu);
+ $prevflg = 1 if ($student eq $firststu);
+ }
+ foreach my $student (@nextlist) {
+ $ENV{'form.student'} = $student;
+ $request->print(&submission($request));
+ }
+ $request->print ("<h2><font color=\"#339933\">Grading</font></h2>");
+
+ #get info for each student
+ foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ 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 'The End';
+# return $result;
+}
+
+sub saveHandGrade {
+ my ($url,$symb,$stuname,$domain,$newscore,@parts) = @_;
+
+# my ($stuname,$domain) = split(/:/,$student);
+ my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
+ my %newrecord;
+
+ foreach my $part (@parts) {
+ my ($temp,$part,$type)=split(/_/,$part);
+ my $oldscore=$record{"resource.$part.$type"};
+ if ($type eq 'solved') {
+ 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 = 'partial_correct'; }
+ }
+ 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'}";
+# print "grader=$newrecord{'resource.regrader'}:<br>records<br>";
+# while (my ($k,$v) = each %newrecord) {
+# print "k=$k:v=$v:<br>\n";
+# }
+# &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
+ }
+ return '';
+ }
+}
+
sub get_symb_and_url {
my ($request) = @_;
my $url=$ENV{'form.url'};
$url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
- my $symb=$ENV{'form.symb'};
- if (!$symb) { $symb=&Apache::lonnet::symbread($url); }
+# my $symb=$ENV{'form.symb'};
+# if (!$symb) { $symb=&Apache::lonnet::symbread($url); }
+ 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);
}
@@ -349,7 +610,7 @@ sub view_edit_entire_class_form {
'<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="View/Edit Entire Class" />'."\n".
+ '<input type="submit" name="submit" value="View/Grade Entire Class" />'."\n".
'</form>'."\n";
return $result;
}
@@ -371,7 +632,7 @@ sub gradingmenu {
if (!$symb) {return '';}
my $result='<h2> <font color="#339933">Select a Grading Method</font></h2><br />';
- $result.='<table width=100% border=0><tr><td bgcolor=#000000>'."\n";
+ $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
$result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n";
$result.=' <b>Resource :</b> '.$url.'</td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";
@@ -386,7 +647,13 @@ sub gradingmenu {
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="command" value="submission" />'."\n".
- '<input type="submit" name="submit" value="View/Edit Student" />'."\n".
+ '<input type="submit" name="submit" value="View/Grade A Student" />'."\n".
+ '</form>'."\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="receiptInput" />'."\n".
+ '<input type="submit" name="submit" value="Verify Receipt" />'."\n".
'</form>'."\n";
$result.='</td></tr></table>'."\n";
$result.='</td></tr></table>'."\n";
@@ -418,20 +685,24 @@ sub viewgrades {
'<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="#000000">'."\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'); }
+ print "Manual grading:$url:$part:$display:<br>";
$result.='<td><b>'.$display.'</b></td>'."\n";
- }
+ }
$result.='</tr>';
#get info for each student
foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ 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><input type="submit" name="submit" value="Submit Changes" /></form>';
+ $result.='</table></td></tr></table>';
+ $result.='<input type="submit" name="submit" value="Submit Changes" /></form>';
$result.=&show_grading_menu_form($symb,$url);
return $result;
}
@@ -789,6 +1060,8 @@ sub handler {
$request->print(&gradingmenu($request));
} elsif ($command eq 'viewgrades') {
$request->print(&viewgrades($request));
+ } elsif ($command eq 'handgrade') {
+ $request->print(&processHandGrade($request));
} elsif ($command eq 'editgrades') {
$request->print(&editgrades($request));
} elsif ($command eq 'verify') {
@@ -797,6 +1070,8 @@ sub handler {
$request->print(&csvupload($request));
} elsif ($command eq 'csvuploadmap') {
$request->print(&csvuploadmap($request));
+ } elsif ($command eq 'receiptInput') {
+ &receiptInput($request);
} elsif ($command eq 'csvuploadassign') {
if ($ENV{'form.associate'} ne 'Reverse Association') {
$request->print(&csvuploadassign($request));