--- loncom/homework/grades.pm 2001/04/17 21:07:38 1.6
+++ loncom/homework/grades.pm 2001/11/29 23:16:29 1.17
@@ -1,5 +1,34 @@
+# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
+#
+# $Id: grades.pm,v 1.17 2001/11/29 23:16:29 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# 2/9,2/13 Guy Albertelli
+# 6/8 Gerd Kortemeyer
+# 7/26 H.K. Ng
+# 8/20 Gerd Kortemeyer
package Apache::grades;
use strict;
@@ -15,23 +44,74 @@ sub moreinfo {
$request->print("Unable to process request: $reason");
if ( $Apache::grades::viewgrades eq 'F' ) {
$request->print('<form action="/adm/grades" method="post">'."\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("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'"></input>'."<br />\n");
- $request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'"></input>'."<br />\n");
- $request->print('<input type="submit" name="submit" value="ReSubmit"></input>'."<br />\n");
+ if ($ENV{'form.url'}) {
+ $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
+ }
+ if ($ENV{'form.symb'}) {
+ $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
+ }
+ $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
+ $request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'" />'."<br />\n");
+ $request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");
+ $request->print('<input type="submit" name="submit" value="ReSubmit" />'."<br />\n");
$request->print('</form>');
}
return '';
}
-#FIXME - needs to be much smarter
+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");
+ if ($ENV{'form.url'}) {
+ $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
+ }
+ if ($ENV{'form.symb'}) {
+ $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
+ }
+ $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
+ $request->print('<input type="hidden" name="student" value="'.$sname.'" />'."\n");
+ $request->print('<input type="hidden" name="domain" value="'.$sdom.'" />'."\n");
+ $request->print('<input type="submit" name="submit" value="View" />'."<br />\n");
+ $request->print('</form>');
+ }
+ }
+
+}
+
+
+#FIXME - needs to handle multiple matches
sub finduser {
my ($name) = @_;
+ my $domain = '';
if ( $Apache::grades::viewgrades eq 'F' ) {
- return ($name,$ENV{'user.domain'});
+ #get classlist
+ my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+ my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
+ #print "Found $cdom:$cnum:$chome<br />";
+ my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+ foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ my ($posname,$posdomain) = split(/:/,$student);
+ if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
+ }
+ return ($name,$domain);
} else {
return ($ENV{'user.name'},$ENV{'user.domain'});
}
@@ -47,9 +127,10 @@ sub getclasslist {
my ($end,$start)=split(/:/,$value);
# still a student?
if (($hideexpired) && ($end) && ($end < $now)) {
- print "Skipping:$name:$end:$now<br />\n";
+ #print "Skipping:$name:$end:$now<br />\n";
next;
}
+ #print "record=$record<br>";
push( @{ $classlist{'allids'} }, $name);
}
return (%classlist);
@@ -70,25 +151,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,
- &Apache::lonnet::homeserver($stuname,$domain));
+ 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/) {
@@ -115,8 +195,8 @@ sub setstudentgrade {
my ($stuname,$domain) = split(/:/,$student);
- my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname,
- &Apache::lonnet::homeserver($stuname,$domain));
+ my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
+
my %newrecord;
foreach my $part (@parts) {
@@ -152,8 +232,8 @@ sub setstudentgrade {
}
if ( scalar(keys(%newrecord)) > 0 ) {
$newrecord{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
- &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname,
- &Apache::lonnet::homeserver($stuname,$domain));
+ &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
+
$result.="Stored away ".scalar(keys(%newrecord))." elements.<br />\n";
}
return $result;
@@ -164,14 +244,22 @@ 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);
+ my $symb;
+ if ($ENV{'form.symb'}) {
+ $symb=$ENV{'form.symb'};
+ } else {
+ $symb=&Apache::lonnet::symbread($url);
+ }
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
- my $home=&Apache::lonnet::homeserver($uname,$udom);
- my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,$home,
+ my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
$ENV{'request.course.id'});
- my $result="<h2> Submission Record </h2> $uname:$udom for $url".$answer;
+ my $result="<h2> Submission Record </h2> $uname:$udom for $url <br />".$answer;
+ 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:";
return $result;
}
@@ -191,30 +279,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="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;
}
@@ -278,17 +370,48 @@ sub handler {
}
$request->send_http_header;
return OK if $request->header_only;
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
my $url=$ENV{'form.url'};
my $symb=$ENV{'form.symb'};
my $command=$ENV{'form.command'};
-
+ if (!$url) {
+ my ($temp1,$temp2);
+ ($temp1,$temp2,$ENV{'form.url'})=split(/___/,$symb);
+ $url = $ENV{'form.url'};
+ }
&send_header($request);
if ($url eq '' && $symb eq '') {
- $request->print("Non-Contextual Access Unsupported:$command:$url:");
+ if ($ENV{'user.adv'}) {
+ if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
+ ($ENV{'form.codethree'})) {
+ my $token=$ENV{'form.codeone'}.'*'.$ENV{'form.codetwo'}.'*'.
+ $ENV{'form.codethree'};
+ my ($tsymb,$tuname,$tudom,$tcrsid)=
+ &Apache::lonnet::checkin($token);
+ if ($tsymb) {
+ my ($map,$id,$url)=split(/\_\_\_/,$tsymb);
+ if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
+ $request->print(
+ &Apache::lonnet::ssi('/res/'.$url,
+ ('grade_username' => $tuname,
+ 'grade_domain' => $tudom,
+ 'grade_courseid' => $tcrsid,
+ 'grade_symb' => $tsymb)));
+ } else {
+ $request->print('<h1>Not authorized: '.$token.'</h1>');
+ }
+ } else {
+ $request->print('<h1>Not a valid DocID: '.$token.'</h1>');
+ }
+ } else {
+ $request->print(&Apache::lonxml::tokeninputfield());
+ }
+ }
} 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') {