--- loncom/homework/grades.pm 2001/04/16 23:34:11 1.5
+++ loncom/homework/grades.pm 2002/04/09 03:56:29 1.20
@@ -1,5 +1,34 @@
+# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
+#
+# $Id: grades.pm,v 1.20 2002/04/09 03:56: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,83 @@ sub moreinfo {
$request->print("Unable to process request: $reason");
if ( $Apache::grades::viewgrades eq 'F' ) {
$request->print('');
}
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 ('
Show Student Submissions on Assessment
'.
+ '
Username
Domain
Name
'
+ );
+ 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 ";
+ my (@nameparts) = split /&/,$reply;
+# my $sfullname = $Apache::lonnet::unescape($nameparts[0]);
+
+ if ( $Apache::grades::viewgrades eq 'F' ) {
+ $request->print(
+ "\n".'
');
+ }
+ }
+ $request->print('
');
+}
+
+
+#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 ";
+ 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 +136,10 @@ sub getclasslist {
my ($end,$start)=split(/:/,$value);
# still a student?
if (($hideexpired) && ($end) && ($end < $now)) {
- print "Skipping:$name:$end:$now \n";
+ #print "Skipping:$name:$end:$now \n";
next;
}
+ #print "record=$record ";
push( @{ $classlist{'allids'} }, $name);
}
return (%classlist);
@@ -60,7 +150,9 @@ sub getpartlist {
my @parts =();
my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
foreach my $key (@metakeys) {
- if ( $key =~ m/stores_([0-9]+)_.*/ ) { push(@parts,$key); }
+ if ( $key =~ m/stores_([0-9]+)_.*/ ) {
+ push(@parts,$key);
+ }
}
return @parts;
}
@@ -68,35 +160,34 @@ 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.="
$stuname
$domain
\n";
+ $result.="
$stuname
$domain
\n";
foreach my $part (@parts) {
my ($temp,$part,$type)=split(/_/,$part);
#print "resource.$part.$type = ".$record{"resource.$part.$type"}." \n";
if ($type eq 'awarded') {
my $score=$record{"resource.$part.$type"};
- $result.="
';
return $result;
}
-
+#FIXME need to look at the meatdata 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 ='Hi!';
+ my $result ='';
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) {
my ($temp,$part,$type)=split(/_/,$part);
my $oldscore=$record{"resource.$part.$type"};
- my $newscore=$ENV{"GRADE.$stuname.$part.$type"};
- if ($oldscore != $newscore) {
- $result.="$stuname:$part:$type:changed from $oldscore to $newscore: \n";
+ my $newscore=$ENV{"form.GRADE.$student.$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;
+ $result.="Updating $stuname to $newscore \n";
+ 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'; }
+ } else {
+ #$result.="$stuname:$part:$type:unchanged $oldscore to $newscore: \n";
+ }
+ if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }
} else {
- $result.="$stuname:$part:$type:changed same $oldscore to $newscore: \n";
+ if ($oldscore ne $newscore) {
+ $newrecord{"resource.$part.$type"}=$newscore;
+ $result.="Updating $student"."'s status for $part.$type to $newscore \n";
+ } else {
+ #$result.="$stuname:$part:$type:unchanged $oldscore to $newscore: \n";
+ }
}
}
+ 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. \n";
+ }
return $result;
}
@@ -133,14 +253,26 @@ 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="
Submission Record
$uname:$udom for $url".$answer;
+ my $result="
Submission Record
$uname:$udom for $url ".$answer;
+ my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+ $ENV{'request.course.id'});
+ $result.="Student's view of the problem: $rendered Correct answer:";
+
+ my $answer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+ $ENV{'request.course.id'});
+ $result.=$answer;
return $result;
}
@@ -160,24 +292,34 @@ sub viewgrades {
my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
#print "Found $cdom:$cnum:$chome ";
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 ("
Manual Grading
");
+
#start the form
$result = '';
return $result;
}
@@ -189,7 +331,6 @@ sub editgrades {
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'});
my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
@@ -203,7 +344,7 @@ sub editgrades {
''."\n".
''."\n".
''."\n".
- ''."\n";
+ ' '."\n";
foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
$result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
@@ -216,11 +357,11 @@ sub editgrades {
sub send_header {
my ($request)= @_;
$request->print(&Apache::lontexconvert::header());
- $request->print("
-");
+# $request->print("
+#");
$request->print('');
}
@@ -242,17 +383,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('