--- loncom/homework/grades.pm 2001/08/06 20:29:37 1.13 +++ loncom/homework/grades.pm 2002/05/03 22:34:25 1.22 @@ -1,7 +1,34 @@ +# The LearningOnline Network with CAPA # The LON-CAPA Grading handler +# +# $Id: grades.pm,v 1.22 2002/05/03 22:34:25 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; @@ -17,11 +44,16 @@ sub moreinfo { $request->print("Unable to process request: $reason"); if ( $Apache::grades::viewgrades eq 'F' ) { $request->print('
'."\n"); - $request->print(''."\n"); - $request->print(''."\n"); - $request->print("Student:".''."
\n"); - $request->print("Domain:".''."
\n"); - $request->print(''."
\n"); + if ($ENV{'form.url'}) { + $request->print(''."\n"); + } + if ($ENV{'form.symb'}) { + $request->print(''."\n"); + } + $request->print(''."\n"); + $request->print("Student:".''."
\n"); + $request->print("Domain:".''."
\n"); + $request->print(''."
\n"); $request->print('
'); } return ''; @@ -32,7 +64,9 @@ 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
"); + $request->print ('

Show Student Submissions on Assessment

'. + '' + ); my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0'); foreach my $student ( sort(@{ $classlist{'allids'} }) ) { my ($sname,$sdom) = split(/:/,$student); @@ -40,22 +74,33 @@ sub listStudents { my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname. ':environment:lastname&generation&firstname&middlename', &Apache::lonnet::homeserver($sname,$sdom)); - print "reply=$reply
"; + #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("$sname @nameparts\n"); - $request->print(''."\n"); - $request->print(''."\n"); - $request->print(''."\n"); - $request->print(''."\n"); - $request->print(''."
\n"); - $request->print(''); + $request->print("\n".''."'); } } - + $request->print('
UsernameDomainName 
$sname$sdom@nameparts". + '
'); + if ($ENV{'form.url'}) { + $request->print( + ''); + } + if ($ENV{'form.symb'}) { + $request->print( + ''); + } + $request->print( + ''); + $request->print( + ''); + $request->print( + ''); + $request->print( + ''); + $request->print('
'); } @@ -90,10 +135,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
"; + #print "record=$record
"; push( @{ $classlist{'allids'} }, $name); } return (%classlist); @@ -210,11 +255,23 @@ sub submission { # 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 $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, $ENV{'request.course.id'}); 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:
"; + + $answer=&Apache::loncommon::get_student_answers($symb,$uname,$udom, + $ENV{'request.course.id'}); + $result.=$answer; return $result; } @@ -244,8 +301,8 @@ sub viewgrades { #start the form $result = '
'."\n". - ''."\n". - ''."\n". + ''."\n". + ''."\n". ''."\n". ''."\n". '
'."\n". @@ -325,17 +382,47 @@ 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('

Not authorized: '.$token.'

'); + } + } else { + $request->print('

Not a valid DocID: '.$token.'

'); + } + } else { + $request->print(&Apache::lonxml::tokeninputfield()); + } + } } else { $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); if ($command eq 'submission') { - $request->print(&listStudents($request)) if ($ENV{'form.student'} eq ''); + &listStudents($request) if ($ENV{'form.student'} eq ''); $request->print(&submission($request)) if ($ENV{'form.student'} ne ''); } elsif ($command eq 'viewgrades') { $request->print(&viewgrades($request));