--- loncom/homework/grades.pm 2001/07/26 15:50:25 1.9
+++ loncom/homework/grades.pm 2001/07/27 18:20:16 1.10
@@ -1,6 +1,7 @@
# The LON-CAPA Grading handler
# 2/9,2/13 Guy Albertelli
# 6/8 Gerd Kortemeyer
+# 7/26 H.K. Ng
package Apache::grades;
use strict;
@@ -27,6 +28,37 @@ sub moreinfo {
}
+sub listStudents {
+ my ($request) = shift;
+ my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+ my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
+ $request->print ("Found $cdom:$cnum:$chome<br />");
+ my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+ foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ my ($sname,$sdom) = split(/:/,$student);
+
+ my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
+ ':environment:lastname&generation&firstname&middlename',
+ &Apache::lonnet::homeserver($sname,$sdom));
+ print "reply=$reply<br>";
+ my (@nameparts) = split /&/,$reply;
+# my $sfullname = $Apache::lonnet::unescape($nameparts[0]);
+
+ if ( $Apache::grades::viewgrades eq 'F' ) {
+ $request->print('<form action="/adm/grades" method="post">'."\n");
+ $request->print("$sname @nameparts\n");
+ $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'"></input>'."\n");
+ $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'"></input>'."\n");
+ $request->print('<input type="hidden" name="student" value="'.$sname.'"></input>'."\n");
+ $request->print('<input type="hidden" name="domain" value="'.$sdom.'"></input>'."\n");
+ $request->print('<input type="submit" name="submit" value="View"></input>'."<br />\n");
+ $request->print('</form>');
+ }
+ }
+
+}
+
+
#FIXME - needs to handle multiple matches
sub finduser {
my ($name) = @_;
@@ -61,6 +93,7 @@ sub getclasslist {
print "Skipping:$name:$end:$now<br />\n";
next;
}
+ print "record=$record<br>";
push( @{ $classlist{'allids'} }, $name);
}
return (%classlist);
@@ -81,24 +114,24 @@ sub getpartlist {
sub viewstudentgrade {
my ($url,$symb,$courseid,$student,@parts) = @_;
my $result ='';
-
+ my $cellclr = '"#ffffdd"';
my ($stuname,$domain) = split(/:/,$student);
my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
- $result.="<tr><td>$stuname</td><td>$domain</td>\n";
+ $result.="<tr><td bgcolor=$cellclr>$stuname</td><td bgcolor=$cellclr 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><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n";
+ $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><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n"
+ $result.="<td bgcolor=$cellclr 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><select name=\"GRADE.$student.$part.$type\">\n";
+ $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/) {
@@ -163,6 +196,7 @@ sub setstudentgrade {
if ( scalar(keys(%newrecord)) > 0 ) {
$newrecord{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
&Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
+
$result.="Stored away ".scalar(keys(%newrecord))." elements.<br />\n";
}
return $result;
@@ -173,11 +207,13 @@ sub submission {
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=&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,
+ my $home=&Apache::lonnet::homeserver($uname,$udom);
+ my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,$home,
$ENV{'request.course.id'});
my $result="<h2> Submission Record </h2> $uname:$udom for $url".$answer;
return $result;
@@ -199,30 +235,34 @@ sub viewgrades {
my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
#print "Found $cdom:$cnum:$chome<br />";
my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
-
+ my $headerclr = '"#ccffff"';
+ my $cellclr = '"#ffffcc"';
#get list of parts for this problem
my (@parts) = &getpartlist($url);
+ $request->print ("<h2><font color=\"#339966\">Manual Grading</font></h2>");
+
#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>'."\n".
- '<tr><td>UserId</td><td>Domain</td>'."\n";
+ '<table border=0><tr><td bgcolor="#999999">'."\n".
+ '<table border=0>'."\n".
+ '<tr><td bgcolor='.$headerclr.'>UserId</td><td bgcolor='.$headerclr.'>Domain</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>$display</td>\n";
+ $result.='<td bgcolor='.$headerclr.'>'.$display.'</td>'."\n";
}
$result.="</tr>";
#get info for each student
foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
}
- $result.='</table><input type="submit" name="submit" value="Submit Changes" /></form>';
+ $result.='</table></td></tr></table><input type="submit" name="submit" value="Submit Changes" /></form>';
return $result;
}
@@ -296,7 +336,8 @@ sub handler {
} else {
$Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
if ($command eq 'submission') {
- $request->print(&submission($request));
+ $request->print(&listStudents($request)) if ($ENV{'form.student'} eq '');
+ $request->print(&submission($request)) if ($ENV{'form.student'} ne '');
} elsif ($command eq 'viewgrades') {
$request->print(&viewgrades($request));
} elsif ($command eq 'editgrades') {