--- loncom/homework/grades.pm 2001/04/17 21:07:38 1.6 +++ loncom/homework/grades.pm 2001/10/05 21:51:14 1.16 @@ -1,5 +1,8 @@ # The LON-CAPA Grading handler # 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 +18,74 @@ 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 ''; } -#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
"); + 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("$sname @nameparts\n"); + if ($ENV{'form.url'}) { + $request->print(''."\n"); + } + if ($ENV{'form.symb'}) { + $request->print(''."\n"); + } + $request->print(''."\n"); + $request->print(''."\n"); + $request->print(''."\n"); + $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 +101,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); @@ -70,25 +125,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.="$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.="\n"; + $result.="\n"; } elsif ($type eq 'tries') { my $score=$record{"resource.$part.$type"}; - $result.="\n" + $result.="\n" } elsif ($type eq 'solved') { my $score=$record{"resource.$part.$type"}; - $result.="\n"; if ($score =~ /^correct/) { $result.="\n\n\n\n\n"; } elsif ($score =~ /^incorrect/) { @@ -115,8 +169,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 +206,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.
\n"; } return $result; @@ -164,14 +218,19 @@ 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; return $result; } @@ -191,30 +250,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 = '
'."\n". - ''."\n". - ''."\n". + ''."\n". + ''."\n". ''."\n". ''."\n". - ''."\n". - ''."\n"; + '
UserIdDomain
'."\n". + ''."\n". + ''."\n"; foreach my $part (@parts) { my $display=&Apache::lonnet::metadata($url,$part.'.display'); if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } - $result.="\n"; + $result.=''."\n"; } $result.=""; #get info for each student foreach my $student ( sort(@{ $classlist{'allids'} }) ) { $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts); } - $result.='
UserIdDomain$display'.$display.'
'; + $result.='
'; return $result; } @@ -278,17 +341,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('

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(&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') {