--- loncom/homework/grades.pm 2002/05/21 02:29:22 1.26
+++ loncom/homework/grades.pm 2002/06/26 21:25:31 1.32
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.26 2002/05/21 02:29:22 albertel Exp $
+# $Id: grades.pm,v 1.32 2002/06/26 21:25:31 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,18 +86,18 @@ sub verifyreceipt {
$matches++;
}
}
- $request->print('<p>'.$matches.' match(es)</p>');
+ $request->printf('<p>'.$matches." match%s</p>",$matches <= 1 ? '' : 'es');
}
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"};
my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
$request->print(<<ENDHEADER);
-<h1>Verify a Submission Receipt Issued by this Server</h1>
+<h2><font color="#339933">Verify a Submission Receipt Issued by this Server</font></h2>
<form action="/adm/grades" method="post">
<tt>$hostver-<input type="text" name="receipt" size="4"></tt>
<input type="submit" name="submit" value="Verify">
@@ -108,11 +111,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>
-<h1>Show Student Submissions on Assessment</h1>
-<table border="1">
-<tr><th>Username</th><th>Domain</th><th>Name</th><th> </th></tr>
+<h2><font color="#339933">Show Student Submissions on Assessment</font></h2>
+
+<table border="0"><tr><td bgcolor="#777777">
+<table border="0">
+<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'} }) ) {
@@ -125,32 +157,44 @@ ENDTABLEST
my ($tmp) = keys(%name);
if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
$fullname=$name{'lastname'}.$name{'generation'};
- if ($fullname =~ /[^\s]+/) { $fullname.=','; }
+ if ($fullname =~ /[^\s]+/) { $fullname.=', '; }
$fullname.=$name{'firstname'}.' '.$name{'middlename'};
}
if ( $Apache::grades::viewgrades eq 'F' ) {
- $request->print("\n".'<tr>'."<td>$sname</td><td>$sdom</td><td>$fullname</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.'" />');
$request->print(
- '<input type="hidden" name="student" value="'.$sname.'" />');
+ '<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="submission" value="last" checked> last '.
+ '<input type="radio" name="submission" value="all"> all </td>');
+ my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname);
$request->print(
- '<input type="submit" name="submit" value="View" />');
- $request->print('</form></td></tr>');
+ '<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>');
}
}
- $request->print('</table>');
+ $request->print('</table></td></tr></table>');
}
@@ -196,7 +240,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);
}
}
@@ -207,57 +251,53 @@ sub viewstudentgrade {
my ($url,$symb,$courseid,$student,@parts) = @_;
my $result ='';
my $cellclr = '"#ffffdd"';
- my ($stuname,$domain) = split(/:/,$student);
+ my ($username,$domain) = split(/:/,$student);
- my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
+ 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'};
- $result.="<tr><td bgcolor=$cellclr>$stuname</td><td bgcolor=$cellclr align=\"middle\">$domain</td>\n";
+ $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 bgcolor=$cellclr 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 bgcolor=$cellclr 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"};
- $result.="<td bgcolor=$cellclr 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 ($status,$foo)=split(/_/,$score,2);
+ $result.="<td align=\"middle\"><select name=\"GRADE.$student.$part.$type\">\n";
+ my $optsel = '<option>correct</option><option>incorrect</option><option>excused</option>'.
+ '<option>ungraded</option><option>handgraded</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.='</tr>';
+ $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' ) {
@@ -286,7 +326,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";
@@ -294,67 +338,214 @@ sub setstudentgrade {
return $result;
}
+# --------------------------- show submissions of a student, option to grade --------
+#
sub submission {
my ($request) = @_;
+ $request->print(<<JAVASCRIPT);
+<script type="text/javascript" language="javascript">
+ function updateRadio() {
+ var pts = document.SCORE.GRADE_BOX.value;
+ var radioButton = document.SCORE.radval;
+ var checked =true;
+ var unchecked=false;
+ 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) {
+ document.SCORE.GRADE_BOX.value = i;
+ resetbox = true;
+ }
+ }
+ if (!resetbox) {
+ document.SCORE.GRADE_BOX.value = "";
+ }
+ return;
+ }
+
+ for (var i=0; i<radioButton.length; i++) {
+ radioButton[i].checked=unchecked;
+ if (pts == i) {
+ radioButton[i].checked=checked;
+ }
+ }
+ }
+
+</script>
+JAVASCRIPT
my $url=$ENV{'form.url'};
$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 ''; }
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'});
- my $result="<h2> Submission Record </h2> $uname:$udom for $url <br />".$answer;
- my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+#
+# header info
+ my $result='<h2><font color="#339933">Submission Record</font></h2>';
+ $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"><tr><td bgcolor="#777777">';
+ $result.='<table border="0"><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 = '';
+ $last = 'last' if ($ENV{'form.submission'} eq '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="command" value="handgrade" />'."\n";
+
+ $result.='<table border="0"><tr><td><b>Points</b></td><td>';
+ my $ctr = 0;
+ while ($ctr<=$wgt) {
+ $result.= '<input type="radio" name="radval" '.
+# 'onclick="javascript:writeBox(\'GRADE_'.$ENV{'form.student'}.'\',\''.$ctr.'\')" '.
+ 'onclick="javascript:SCORE.GRADE_BOX.value='.$ctr.'" '.
+ ($score == $ctr? 'checked':'').' /> '.$ctr."\n";
+ $ctr++;
+ }
+ $result.='</td><td> <b>or</b> </td>';
+ $result.='<td><input type="text" name="GRADE_BOX"'.
+ ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
+ 'onChange="javascript:updateRadio()" /></td>'."\n";
+ $result.='<td>/'.$wgt.' (problem weight)</td></tr>';
+
+ $result.='<input type="hidden" name="GRADE_'.$uname.':'.$udom.'" value="handgraded" />'."\n";
+ $result.='<tr><td colspan="5"><input type="submit" name="gradeOpt" value="Save & Next" /> ';
+ $result.='<input type="submit" name="gradeOpt" value="Next" /> ';
+ $result.='<input type="submit" name="gradeOpt" value="Previous" /> ';
+ $result.='</td><tr></table></form>';
return $result;
}
+sub processHandGrade {
+ my ($url,$symb,$courseid,$student,@parts) = @_;
+
+ 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_BOX'} ne '' ? $ENV{"form.GRADE_BOX"} : $ENV{'form.radval'});
+ 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 'handgraded') { $newscore = 'handgraded_by_grader'; }
+ }
+ 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);
}
+sub view_edit_entire_class_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="viewgrades" />'."\n".
+ '<input type="submit" name="submit" value="View/Grade Entire Class" />'."\n".
+ '</form>'."\n";
+ return $result;
+}
+
+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;
+}
+
sub gradingmenu {
my ($request) = @_;
my ($symb,$url)=&get_symb_and_url($request);
if (!$symb) {return '';}
- my $result='<h2>Select a grading method</h2><br />';
- $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="View/Edit Entire Class" />'."\n".
- '</form>';
+
+ my $result='<h2> <font color="#339933">Select a Grading Method</font></h2><br />';
+ $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";
+ $result.=&view_edit_entire_class_form($symb,$url);
$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="csvupload" />'."\n".
'<input type="submit" name="submit" value="Upload Scores" />'."\n".
- '</form>';
+ '</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="submission" />'."\n".
- '<input type="submit" name="submit" value="View/Edit Student" />'."\n".
- '</form>';
+ '<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";
return $result;
}
@@ -373,9 +564,9 @@ sub viewgrades {
my $cellclr = '"#ffffcc"';
#get list of parts for this problem
- my (@parts) = &getpartlist($url);
+ my (@parts) = sort(&getpartlist($url));
- $request->print ("<h2><font color=\"#339966\">Manual Grading</font></h2>");
+ $request->print ("<h2><font color=\"#339933\">Manual Grading</font></h2>");
#start the form
$result = '<form action="/adm/grades" method="post">'."\n".
@@ -383,21 +574,25 @@ 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="#999999">'."\n".
+ '<table border=0><tr><td bgcolor="#777777">'."\n".
'<table border=0>'."\n".
- '<tr><td bgcolor='.$headerclr.'>UserId</td><td bgcolor='.$headerclr.'>Domain</td>'."\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 bgcolor='.$headerclr.'>'.$display.'</td>'."\n";
- }
- $result.="</tr>";
+ 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;
}
@@ -449,16 +644,88 @@ ENDUPFORM
return $result;
}
+sub csvupload_javascript_reverse_associate {
+ return(<<ENDPICK);
+ function verify(vf) {
+ var foundsomething=0;
+ var founduname=0;
+ var founddomain=0;
+ for (i=0;i<=vf.nfields.value;i++) {
+ tw=eval('vf.f'+i+'.selectedIndex');
+ if (i==0 && tw!=0) { founduname=1; }
+ if (i==1 && tw!=0) { founddomain=1; }
+ if (i!=0 && i!=1 && tw!=0) { foundsomething=1; }
+ }
+ if (founduname==0 || founddomain==0) {
+ alert('You need to specify at both the username and domain');
+ return;
+ }
+ if (foundsomething==0) {
+ alert('You need to specify at least one grading field');
+ return;
+ }
+ vf.submit();
+ }
+ function flip(vf,tf) {
+ var nw=eval('vf.f'+tf+'.selectedIndex');
+ var i;
+ for (i=0;i<=vf.nfields.value;i++) {
+ //can not pick the same destination field for both name and domain
+ if (((i ==0)||(i ==1)) &&
+ ((tf==0)||(tf==1)) &&
+ (i!=tf) &&
+ (eval('vf.f'+i+'.selectedIndex')==nw)) {
+ eval('vf.f'+i+'.selectedIndex=0;')
+ }
+ }
+ }
+ENDPICK
+}
+
+sub csvupload_javascript_forward_associate {
+ return(<<ENDPICK);
+ function verify(vf) {
+ var foundsomething=0;
+ var founduname=0;
+ var founddomain=0;
+ for (i=0;i<=vf.nfields.value;i++) {
+ tw=eval('vf.f'+i+'.selectedIndex');
+ if (tw==1) { founduname=1; }
+ if (tw==2) { founddomain=1; }
+ if (tw>2) { foundsomething=1; }
+ }
+ if (founduname==0 || founddomain==0) {
+ alert('You need to specify at both the username and domain');
+ return;
+ }
+ if (foundsomething==0) {
+ alert('You need to specify at least one grading field');
+ return;
+ }
+ vf.submit();
+ }
+ function flip(vf,tf) {
+ var nw=eval('vf.f'+tf+'.selectedIndex');
+ var i;
+ //can not pick the same destination field twice
+ for (i=0;i<=vf.nfields.value;i++) {
+ if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) {
+ eval('vf.f'+i+'.selectedIndex=0;')
+ }
+ }
+ }
+ENDPICK
+}
+
sub csvuploadmap_header {
my ($request,$symb,$url,$datatoken,$distotal)= @_;
my $result;
my $javascript;
if ($ENV{'form.upfile_associate'} eq 'reverse') {
-# $javascript=&csv_upload_javascript_reverse_associate();
+ $javascript=&csvupload_javascript_reverse_associate();
} else {
-# $javascript=&csv_upload_javascript_forward_associate();
+ $javascript=&csvupload_javascript_forward_associate();
}
- my $javascript_validations;#=&javascript_validations($krbdefdom);
$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<h3>Uploading Class Grades for resource $url</h3>
@@ -481,7 +748,6 @@ to this page if the data selected is ins
<hr />
<script type="text/javascript" language="Javascript">
$javascript
-$javascript_validations
</script>
ENDPICK
return '';
@@ -491,11 +757,11 @@ ENDPICK
sub csvupload_fields {
my ($url) = @_;
my (@parts) = &getpartlist($url);
- my @fields;
- foreach my $part (@parts) {
+ my @fields=(['username','Student Username'],['domain','Student Domain']);
+ foreach my $part (sort(@parts)) {
my @datum;
my $display=&Apache::lonnet::metadata($url,$part.'.display');
- my $name=&Apache::lonnet::metadata($url,$part.'.name');
+ my $name=$part;
if (!$display) { $display = $name; }
@datum=($name,$display);
push(@fields,\@datum);
@@ -549,6 +815,66 @@ sub csvuploadmap {
return '';
}
+sub csvuploadassign {
+ my ($request)= @_;
+ my ($symb,$url)=&get_symb_and_url($request);
+ if (!$symb) {return '';}
+ &Apache::loncommon::load_tmp_file($request);
+ my @gradedata=&Apache::loncommon::upfile_record_sep();
+ my @keyfields = split(/\,/,$ENV{'form.keyfields'});
+ my %fields=();
+ for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
+ if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ if ($ENV{'form.f'.$i} ne 'none') {
+ $fields{$keyfields[$i]}=$ENV{'form.f'.$i};
+ }
+ } else {
+ if ($ENV{'form.f'.$i} ne 'none') {
+ $fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+ }
+ }
+ }
+ $request->print('<h3>Assigning Grades</h3>');
+ my $courseid=$ENV{'request.course.id'};
+ my $cdom=$ENV{"course.$courseid.domain"};
+ my $cnum=$ENV{"course.$courseid.num"};
+ my (%classlist) = &getclasslist($cdom,$cnum,'1');
+ my @skipped;
+ my $countdone=0;
+ foreach my $grade (@gradedata) {
+ my %entries=&Apache::loncommon::record_sep($grade);
+ my $username=$entries{$fields{'username'}};
+ my $domain=$entries{$fields{'domain'}};
+ if (!exists($classlist{"$username:$domain"})) {
+ push(@skipped,"$username:$domain");
+ next;
+ }
+ my %grades;
+ foreach my $dest (keys(%fields)) {
+ if ($dest eq 'username' || $dest eq 'domain') { next; }
+ if ($entries{$fields{$dest}} eq '') { next; }
+ my $store_key=$dest;
+ $store_key=~s/^stores/resource/;
+ $store_key=~s/_/\./g;
+ $grades{$store_key}=$entries{$fields{$dest}};
+ }
+ $grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ &Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'},
+ $domain,$username);
+ $request->print('.');
+ $request->rflush();
+ $countdone++;
+ }
+ $request->print("<br />Stored $countdone students\n");
+ if (@skipped) {
+ $request->print('<br /><font size="+1"><b>Skipped Students</b></font><br />');
+ foreach my $student (@skipped) { $request->print("<br />$student"); }
+ }
+ $request->print(&view_edit_entire_class_form($symb,$url));
+ $request->print(&show_grading_menu_form($symb,$url));
+ return '';
+}
+
sub send_header {
my ($request)= @_;
$request->print(&Apache::lontexconvert::header());
@@ -569,8 +895,6 @@ sub send_footer {
sub handler {
my $request=$_[0];
- if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;}
-
if ($ENV{'browser.mathml'}) {
$request->content_type('text/xml');
} else {
@@ -616,7 +940,7 @@ sub handler {
}
}
} else {
- &Apache::lonhomework::showhashsubset(\%ENV,'^form');
+ #&Apache::lonhomework::showhashsubset(\%ENV,'^form');
$Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
if ($command eq 'submission') {
&listStudents($request) if ($ENV{'form.student'} eq '');
@@ -633,6 +957,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));