--- loncom/homework/grades.pm 2002/06/20 21:21:16 1.28 +++ loncom/homework/grades.pm 2002/07/30 19:59:58 1.43 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.28 2002/06/20 21:21:16 ng Exp $ +# $Id: grades.pm,v 1.43 2002/07/30 19:59:58 ng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,6 +29,9 @@ # 6/8 Gerd Kortemeyer # 7/26 H.K. Ng # 8/20 Gerd Kortemeyer +# Year 2002 +# June, July 2002 H.K. Ng +# package Apache::grades; use strict; @@ -37,35 +40,38 @@ use Apache::lonxml; use Apache::lonnet; use Apache::loncommon; use Apache::lonhomework; +use Apache::lonmsg qw(:user_normal_msg); use Apache::Constants qw(:common); +#use Time::HiRes qw( gettimeofday tv_interval ); sub moreinfo { - my ($request,$reason) = @_; - $request->print("Unable to process request: $reason"); - if ( $Apache::grades::viewgrades eq 'F' ) { - $request->print('
'."\n"); - if ($ENV{'form.url'}) { - $request->print(''."\n"); - } - if ($ENV{'form.symb'}) { - $request->print(''."\n"); + my ($request,$reason) = @_; + $request->print("Unable to process request: $reason"); + if ( $Apache::grades::viewgrades eq 'F' ) { + $request->print(''."\n"); + if ($ENV{'form.url'}) { + $request->print(''."\n"); + } + if ($ENV{'form.symb'}) { + $request->print(''."\n"); + } +# $request->print(''."\n"); + $request->print(''."\n"); + $request->print("Student:".''."
\n"); + $request->print("Domain:".''."
\n"); + $request->print(''."
\n"); + $request->print('
'); } - $request->print(''."\n"); - $request->print("Student:".''."
\n"); - $request->print("Domain:".''."
\n"); - $request->print(''."
\n"); - $request->print(''); - } - return ''; + return ''; } sub verifyreceipt { my $request=shift; my $courseid=$ENV{'request.course.id'}; - my $cdom=$ENV{"course.$courseid.domain"}; - my $cnum=$ENV{"course.$courseid.num"}; +# my $cdom=$ENV{"course.$courseid.domain"}; +# my $cnum=$ENV{"course.$courseid.num"}; my $receipt=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'. - $ENV{'form.receipt'}; + $ENV{'form.receipt'}; $receipt=~s/[^\-\d]//g; my $symb=$ENV{'form.symb'}; unless ($symb) { @@ -74,397 +80,1690 @@ sub verifyreceipt { if ((&Apache::lonnet::allowed('mgr',$courseid)) && ($symb)) { $request->print('

Verifying Submission Receipt '.$receipt.'

'); my $matches=0; - my (%classlist) = &getclasslist($cdom,$cnum,'0'); - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { + my ($classlist) = &getclasslist('all','0'); + foreach my $student ( sort(@{ $$classlist{'all'} }) ) { my ($uname,$udom)=split(/\:/,$student); if ($receipt eq - &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) { - $request->print('Matching '.$student.'
'); - $matches++; + &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) { + $request->print('Matching '.$student.'
'); + $matches++; } } - $request->print('

'.$matches.' match(es)

'); + $request->printf('

'.$matches." match%s

",$matches <= 1 ? '' : 'es'); +# needs to print who is matched } return ''; } -sub listStudents { - my ($request) = shift; - my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"}; - my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"}; - my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}); - $request->print(<Verify a Submission Receipt Issued by this Server -
-$hostver- - - -ENDHEADER - if ($ENV{'form.url'}) { - $request->print( - ''); - } - if ($ENV{'form.symb'}) { - $request->print( - ''); - } - $request->print(< -

Show Student Submissions on Assessment

- -
- - -ENDTABLEST - my (%classlist) = &getclasslist($cdom,$cnum,'0'); - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { - my ($sname,$sdom) = split(/:/,$student); - - my %name=&Apache::lonnet::get('environment', ['lastname','generation', - 'firstname','middlename'], - $sdom,$sname); - my $fullname; - my ($tmp) = keys(%name); - if ($tmp !~ /^(con_lost|error|no_such_host)/i) { +sub student_gradeStatus { + my ($url,$udom,$uname,$partlist) = @_; + my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))); + my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); + my %partstatus = (); + foreach (@$partlist) { + my ($status,$foo)=split(/_/,$record{"resource.$_.solved"},2); + $status = 'nothing' if ($status eq ''); + $partstatus{$_} = $status; + $partstatus{"resource.$_.submitted_by"} = $record{"resource.$_.submitted_by"} + if ($record{"resource.$_.submitted_by"} ne ''); + } + return %partstatus; +} + +sub get_fullname { + my ($uname,$udom) = @_; + my %name=&Apache::lonnet::get('environment', ['lastname','generation', + 'firstname','middlename'],$udom,$uname); + my $fullname; + my ($tmp) = keys(%name); + if ($tmp !~ /^(con_lost|error|no_such_host)/i) { $fullname=$name{'lastname'}.$name{'generation'}; if ($fullname =~ /[^\s]+/) { $fullname.=', '; } $fullname.=$name{'firstname'}.' '.$name{'middlename'}; - } - if ( $Apache::grades::viewgrades eq 'F' ) { - $request->print("\n".''."'); -# $request->print(''); - } - } - $request->print('
UsernameNameDomain 
$sname$fullname$sdom". - ''); - if ($ENV{'form.url'}) { - $request->print( - ''); - } - if ($ENV{'form.symb'}) { - $request->print( - ''); - } - $request->print( - ''); - $request->print( - ''); - $request->print( - ''); - $request->print( - ''); - $request->print( - ''); - $request->print('
'); + } + return $fullname; +} + +sub response_type { + my ($url) = shift; + my $allkeys = &Apache::lonnet::metadata($url,'keys'); +# print "allkeys=>$allkeys
"; + my %seen = (); + my (@partlist,%handgrade); + foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) { + if (/^\w+response_\d+.*/) { + my ($responsetype,$part) = split(/_/,$_,2); + my ($partid,$respid) = split(/_/,$part); + $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no'); + next if ($seen{$partid} > 0); + $seen{$partid}++; + push @partlist,$partid; + } + } + return \@partlist,\%handgrade; +} + + +sub listStudents { + my ($request) = shift; + my $cdom =$ENV{"course.$ENV{'request.course.id'}.domain"}; + my $cnum =$ENV{"course.$ENV{'request.course.id'}.num"}; + my $getsec =$ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'}; + my $submitonly=$ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'}; + + my $result='

 View Submissions for a Student or a Group of Students

'; + $result.=''; + $result.=''; + my ($partlist,$handgrade) = &response_type($ENV{'form.url'}); + for (sort keys(%$handgrade)) { + my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_}); + $ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes'); + $result.=''. + ''. + ''; + } + $result.='
Resource: '.$ENV{'form.url'}.'
Part id: '.(split(/_/))[0].'Type: '.$responsetype.'Handgrade: '.$handgrade.'
'; + $request->print($result); + + $request->print(< + View Problem: no + yes
+ Submissions: + handgrade only + last sub only + last sub & parts info + all details + + + +
+
+ +ENDTABLEST + if ($ENV{'form.url'}) { + $request->print(''."\n"); + } + if ($ENV{'form.symb'}) { + $request->print(''."\n"); + } + $request->print(''."\n"); + + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($getsec,'0'); + + $result='
'. + ''. + ''. + ''; + foreach (sort(@$partlist)) { + $result.=''; + } + $request->print($result.''."\n"); + + foreach my $student (sort(@{ $$classlist{$getsec} }) ) { + my ($uname,$udom) = split(/:/,$student); + my (%status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname,$partlist); + my $statusflg = ''; + foreach (keys(%status)) { + $statusflg = 1 if ($status{$_} ne 'nothing'); + my ($foo,$partid,$foo1) = split(/\./,$_); + if ($status{'resource.'.$partid.'.submitted_by'} ne '') { + $statusflg = ''; + $request->print(''); + } + } + next if ($statusflg eq '' && $submitonly eq 'yes'); + + if ( $Apache::grades::viewgrades eq 'F' ) { + $result=''. + ''."\n". + ''."\n". + ''."\n". + ''."\n"; + + foreach (sort keys(%status)) { + next if (/^resource.*?submitted_by$/); + $result.=''."\n"; + } + $request->print($result.''."\n"); + } + } + $request->print('
 Select  Username  Fullname  Domain  Part ID '.(split(/_/))[0].' Status 
 '.$uname.'  '.$$fullname{$student}.'  '.$udom.'  '.$status{$_}.' 
'); + $request->print('
'); } +sub processGroup { + my ($request) = shift; + my $ctr = 0; + my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}} + : ($ENV{'form.stuinfo'})); + my $total = scalar(@stuchecked)-1; + if ($stuchecked[0] eq '') { + &userError($request,'No student was selected for viewing/grading.'); + return; + } + foreach (@stuchecked) { + my ($uname,$udom,$fullname) = split(/:/); + $ENV{'form.student'} = $uname; + $ENV{'form.fullname'} = $fullname; + &submission($request,$ctr,$total); + $ctr++; + } + return ''; +} + +sub userError { + my ($request, $reason, $step) = @_; + $request->print('

LON-CAPA User Error


'."\n"); + $request->print('Reason: '.$reason.'

'."\n"); + $request->print('Step: '.($step ne '' ? $step : 'Use your browser back button to correct') + .'

'."\n"); + return ''; +} #FIXME - needs to handle multiple matches sub finduser { - my ($name) = @_; - my $domain = ''; - - if ( $Apache::grades::viewgrades eq 'F' ) { - #get classlist - my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); - #print "Found $cdom:$cnum
"; - my (%classlist) = &getclasslist($cdom,$cnum,'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'}); - } + my ($name) = @_; + my $domain = ''; + if ( $Apache::grades::viewgrades eq 'F' ) { + my ($classlist) = &getclasslist('all','0'); + foreach ( sort(@{ $$classlist{'all'} }) ) { + my ($posname,$posdomain) = split(/:/); + if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; } + } + return ($name,$domain); + } else { + return ($ENV{'user.name'},$ENV{'user.domain'}); + } } sub getclasslist { - my ($coursedomain,$coursenum,$hideexpired) = @_; - my %classlist=&Apache::lonnet::dump('classlist',$coursedomain,$coursenum); - my $now = time; - foreach my $student (keys(%classlist)) { - my ($end,$start)=split(/:/,$classlist{$student}); - # still a student? - if (($hideexpired) && ($end) && ($end < $now)) { - #print "Skipping:$name:$end:$now
\n"; - next; + my ($getsec,$hideexpired) = @_; + my $now = time; + my %classlist=&Apache::lonnet::dump('classlist', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my (@holdsec,@sections,%allids,%stusec,%fullname); + foreach (keys(%classlist)) { + my ($end,$start,$id,$section,$fullname)=split(/:/,$classlist{$_}); + # still a student? + if (($hideexpired) && ($end) && ($end < $now)) { + next; + } + $section = ($section ne '' ? $section : 'no'); + push @holdsec,$section; + if ($getsec eq 'all' || $getsec eq $section) { + push (@{ $classlist{$getsec} }, $_); + $allids{$_}=$id; + $stusec{$_}=$section; + $fullname{$_}=$fullname; + } } - #print "record=$record
"; - push( @{ $classlist{'allids'} }, $student); - } - return (%classlist); + my %seen = (); + foreach my $item (@holdsec) { + push (@sections, $item) unless $seen{$item}++; + } + return (\%classlist,\@sections,\%allids,\%stusec,\%fullname); } sub getpartlist { - my ($url) = @_; - my @parts =(); - my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys')); - foreach my $key (@metakeys) { - if ( $key =~ m/stores_([0-9]+)_.*/ ) { - push(@parts,$key); + my ($url) = @_; + my @parts =(); + my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys')); + foreach my $key (@metakeys) { + if ( $key =~ m/stores_([0-9]+)_.*/) { + push(@parts,$key); + } } - } - return @parts; + return @parts; } -sub viewstudentgrade { - my ($url,$symb,$courseid,$student,@parts) = @_; - my $result =''; - my $cellclr = '"#ffffdd"'; - my ($username,$domain) = split(/:/,$student); - - my (@requests) = ('lastname','firstname','middlename','generation'); - my (%name) = &Apache::lonnet::get('environment',\@requests,$domain,$username); - my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username); - my $fullname=$name{'lastname'}.$name{'generation'}; - if ($fullname =~ /[^\s]+/) { $fullname.=', '; } - $fullname.=$name{'firstname'}.' '.$name{'middlename'}; - - $result.="$username$fullname$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"; - } elsif ($type eq 'tries') { - my $score=$record{"resource.$part.$type"}; - $result.="\n" - } elsif ($type eq 'solved') { - my $score=$record{"resource.$part.$type"}; - $result.="\n"; +sub print_hash { + my ($request, $hash) = @_; + $request->print(''); + for (sort keys (%$hash)) { + $request->print(''); } - } - $result.=''; - return $result; + $request->print('
KeyValue
'.$_.''.$$hash{$_}.' 
'); + return ''; } -#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) = @_; +# +# --------------------------- show submissions of a student, option to grade -------- +sub submission { + my ($request,$counter,$total) = @_; - my $result =''; + (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; + if ($ENV{'form.student'} eq '') { &moreinfo($request,'Need student login id'); return ''; } + my ($uname,$udom) = &finduser($ENV{'form.student'}); + if ($uname eq '') { &moreinfo($request,'Unable to find student'); return ''; } + + my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))); + if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; } + my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : ''); + $ENV{'form.vProb'} = $ENV{'form.vProb'} ne '' ? $ENV{'form.vProb'} : 'yes'; + my ($classlist,$seclist,$ids,$stusec,$fullname); + + # header info + if ($counter == 0) { + &sub_page_js($request); + $request->print('

 Submission Record

'. + ' Resource: '.$url.''); + + # option to display problem, only once else it cause problems with the form later + # since the problem has a form. + if ($ENV{'form.vProb'} eq 'yes') { + my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom, + $ENV{'request.course.id'}); + my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom, + $ENV{'request.course.id'}); + my $result.='
'; + $result.='
'; + $result.='Student\'s view of the problem
'.$rendered.'
'; + $result.='Correct answer:
'.$companswer; + $result.='
'; + $result.='

'; + $request->print($result); + } + + # kwclr is the only variable that is guaranteed to be non blank if this subroutine has been called once. + my %keyhash = (); + if ($ENV{'form.kwclr'} eq '') { + %keyhash = &Apache::lonnet::dump('nohist_handgrade', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + + my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'}; + $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : ''; + $ENV{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red'; + $ENV{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0'; + $ENV{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; + $ENV{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ? + $keyhash{$symb.'_subject'} : &Apache::lonnet::metadata($url,'title'); + $ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0'; - my ($stuname,$domain) = split(/:/,$student); + } + $request->print(''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"); + + my ($cts,$prnmsg) = (1,''); + while ($cts <= $ENV{'form.savemsgN'}) { + $prnmsg.=''."\n"; + $cts++; + } + $request->print($prnmsg); - my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname); + if ($ENV{'form.handgrade'} eq 'yes' && $ENV{'form.showgrading'} eq 'yes') { + $request->print(<Keyword Options:  +List    +Paste Selection to List    +Highlight Attribute

+KEYWORDS + } + } + my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); + my ($partlist,$handgrade) = &response_type($url); +# &print_hash($request,\%record); + + # Student info + $request->print(($counter == 0 ? '' : '
')); +# my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)); + my $result='
'. + '
'; + + $result.=''; + if ($$timestamp eq '') { + $lastsubonly.=''; + } else { + for my $part (sort keys(%$handgrade)) { + foreach (@$string) { + my ($partid,$respid) = /^resource\.(\d+)\.(\d+)\.submission/; + if ($part eq ($partid.'_'.$respid)) { + my ($ressub,$subval) = split(/:/,$_,2); + $lastsubonly.='' + if ($ENV{'form.lastSub'} eq 'lastonly' || + ($ENV{'form.lastSub'} eq 'hdgrade' && $$handgrade{$part} =~ /:yes$/)); + } + } + } + } + $lastsubonly.='
Fullname: '.$ENV{'form.fullname'}. +# $result.=''; + if ($ENV{'form.handgrade'} eq 'yes') { + my @col_list; + ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist('all','0'); + for (keys (%$handgrade)) { + my $ncol = &Apache::lonnet::EXT('resource.'.$_.'.maxcollaborators',$symb,$udom,$uname); + if ($ncol > 0) { + s/\_/\./g; + if ($record{'resource.'.$_.'.collaborators'} ne '') { + my (@collaborators) = split(/,?\s+/,$record{'resource.'.$_.'.collaborators'}); + my (@badcollaborators); + if (scalar(@collaborators) != 0) { + $result.=''."\n"; + $result.='' + if (scalar(@badcollaborators) > 0); + + $result.='' if (scalar(@collaborators) > $ncol); + $result.=''."\n"; + } + } + } + } + } + $request->print($result.'
Fullname: '.$fullname. + '   Username: '.$uname. + '   Domain: '.$udom.'
Collaborators: '; + foreach my $collaborator (@collaborators) { + $collaborator = $collaborator =~ /\@|:/ ? + (split(/@|:/,$collaborator))[0] : $collaborator; + next if ($collaborator eq $uname); + if (!grep /^$collaborator:/i,keys %$classlist) { + push @badcollaborators,$collaborator; + next; + } + push @col_list, $collaborator; + $result.=$$fullname{$collaborator.':'.$udom}.' ('.$collaborator.')    '; + } + $result.='
'. + 'This student has submitted '.(scalar (@badcollaborators) > 1 ? '' : 'an'). + ' invalid collaborator'.(scalar (@badcollaborators) > 1 ? 's. ' : '. '). + (join ', ',@badcollaborators).'
'. + 'This student has submitted too many collaborators. Maximum is '. + $ncol.'.
'."\n"); - my %newrecord; - - foreach my $part (@parts) { - my ($temp,$part,$type)=split(/_/,$part); - my $oldscore=$record{"resource.$part.$type"}; - 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; } + # print student answer + if ($ENV{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) { + if ($ENV{'form.'.$uname.':'.$udom.':submitted_by'}) { + my $submitby='
'. + 'Collaborative submission by: '. + ''. + $$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.''; + $submitby.='
'."\n"; + $request->print($submitby); + } else { + my ($string,$timestamp)=&get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'}); + my $lastsubonly.='
Last Submission Only'. + ($$timestamp eq '' ? '' : '    Date Submitted: '.$$timestamp).'
'.$$string[0].'
Part ID '. + $partid.' Response ID '.$respid. + ' Submission '.&keywords_highlight($subval).'
'."\n"; + $request->print($lastsubonly); + } } else { - 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); + $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, + $ENV{'request.course.id'},$last, + '.submission','Apache::grades::keywords_highlight')); + } + + # view submission with no grading option + if ($ENV{'form.showgrading'} eq '') { + $request->print('
'); + return; + } + + $result=''."\n". + ''."\n". + ''."\n"; + $result.=' Compose Message
'."\n" if ($ENV{'form.handgrade'} eq 'yes'); + $request->print($result); + + my %seen = (); + my @partlist; + for (sort keys(%$handgrade)) { + my ($partid,$respid) = split(/_/); + next if ($seen{$partid} > 0); + $seen{$partid}++; + next if ($$handgrade{$_} =~ /:no$/); + push @partlist,$partid; + my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname); + my $wgtmsg = ($wgt > 0 ? '(problem weight)' : 'problem weight assigned by computer'); + $wgt = ($wgt > 0 ? $wgt : '1'); + my $score = ($record{'resource.'.$partid.'.awarded'} eq '' ? + '' : $record{'resource.'.$partid.'.awarded'}*$wgt); + + # display grading options + $result=''; + $result.=''; + $result.=''."\n"; + $result.='
Part '.$partid.' Points'; + + my $ctr = 0; + $result.=''; # display radio buttons in a nice table 10 across + while ($ctr<=$wgt) { + $result.= '\n"; + $result.=(($ctr+1)%10 == 0 ? '' : ''); + $ctr++; + } + $result.='
'.$ctr."
'; - $result.="Stored away ".scalar(keys(%newrecord))." elements.
\n"; - } - return $result; + $result.='		 or /'.$wgt.' '.$wgtmsg.' '; + + $result.=''."  \n"; + $result.=''; + $result.='
'; + $request->print($result); + } + $request->print(''."\n"); + $request->print('
'."\n"); + + # print end of form + if ($counter == $total) { + my $endform.='
'; + my $ntstu =''."\n"; + my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1'); + $ntstu =~ s/
'; + $request->print($endform); + } + return ''; } -sub submission { - my ($request) = @_; - 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; - 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

'; - $result.='Username : '.$uname.'
Fullname : '.$ENV{'form.fullname'}.'
Domain : '.$udom.'
Resource : '.$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; +sub get_last_submission { + my ($symb,$username,$domain,$course)=@_; + if ($symb) { + my (@string,$timestamp); + my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username); + if ($returnhash{'version'}) { + my %lasthash=(); + my ($version); + for ($version=1;$version<=$returnhash{'version'};$version++) { + foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) { + $lasthash{$_}=$returnhash{$version.':'.$_}; + } + } + foreach ((keys %lasthash)) { + if ($_ =~ /\.submission$/) {push @string, (join(':',$_,$lasthash{$_}))} + if ($_ =~ /timestamp/) {$timestamp = scalar(localtime($lasthash{$_}))}; + } + } + @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string; + return \@string,\$timestamp; + } } -sub get_symb_and_url { - my ($request) = @_; - my $url=$ENV{'form.url'}; - $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; - my $symb=$ENV{'form.symb'}; - if (!$symb) { $symb=&Apache::lonnet::symbread($url); } - if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; } - return ($symb,$url); +sub keywords_highlight { + my $string = shift; + my $size = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'}; + my $styleon = $ENV{'form.kwstyle'} eq '' ? '' : $ENV{'form.kwstyle'}; + (my $styleoff = $styleon) =~ s/\$styleon$_$styleoff\<\/font\>/gi; + } + return $string; +} + +sub processHandGrade { + my ($request) = shift; + my $url = $ENV{'form.url'}; + my $symb = $ENV{'form.symb'}; + my $button = $ENV{'form.gradeOpt'}; + my $ngrade = $ENV{'form.NCT'}; + my $ntstu = $ENV{'form.NTSTU'}; + + my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'}; + my %keyhash = (); + $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g; + $ENV{'form.keywords'} =~ s/^\s+|\s+$//; + $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'}; + $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'}; + $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'}; + $keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'}; + $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'}; + + my ($ctr,$idx) = (1,1); + while ($ctr <= $ENV{'form.savemsgN'}) { + if ($ENV{'form.savemsg'.$ctr} ne '') { + $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr}; + $idx++; + } + $ctr++; + } + $ctr = 0; + while ($ctr < $ngrade) { + if ($ENV{'form.newmsg'.$ctr} ne '') { + $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr}; + $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr}; + $idx++; + } + $ctr++; + } + $ENV{'form.savemsgN'} = --$idx; + $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'}; + my $putresult = &Apache::lonnet::put + ('nohist_handgrade',\%keyhash, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + + if ($ENV{'form.refresh'} eq 'on') { + my $ctr = 0; + $ENV{'form.NTSTU'}=$ngrade; + while ($ctr < $ngrade) { + ($ENV{'form.student'},my $udom) = split(/:/,$ENV{'form.unamedom'.$ctr}); + &submission($request,$ctr,$ngrade-1); + $ctr++; + } + return ''; + } + + if ($button eq 'Save & Next') { + my $ctr = 0; + while ($ctr < $ngrade) { + my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr}); + my ($errorflg) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr); + return '' if ($errorflg eq 'error'); + + my $includemsg = $ENV{'form.includemsg'.$ctr}; + my ($subject,$message,$msgstatus) = ('','',''); + if ($includemsg =~ /savemsg|new$ctr/) { + $subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/); + my (@msgnum) = split(/,/,$includemsg); + foreach (@msgnum) { + $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne ''); + } + $message =~ s/\s+/ /g; + $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom, + $ENV{'form.msgsub'},$message); + } + if ($ENV{'form.collaborator'.$ctr}) { + my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr}); + foreach (@collaborators) { + &saveHandGrade($request,$url,$symb,$_,$udom,$ctr, + $ENV{'form.unamedom'.$ctr}); + if ($message ne '') { + $msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom, + $ENV{'form.msgsub'}, + $message); + } + } + } + $ctr++; + } + } + my $firststu = $ENV{'form.unamedom0'}; + my $laststu = $ENV{'form.unamedom'.($ngrade-1)}; + $ctr = 2; + while ($laststu eq '') { + $laststu = $ENV{'form.unamedom'.($ngrade-$ctr)}; + $ctr++; + $laststu = $firststu if ($ctr > $ngrade); + } + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0'); + + my (@parsedlist,@nextlist); + my ($nextflg) = 0; + foreach ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) { + if ($nextflg == 1 && $button =~ /Next$/) { + push @parsedlist,$_; + } + $nextflg = 1 if ($_ eq $laststu); + if ($button eq 'Previous') { + last if ($_ eq $firststu); + push @parsedlist,$_; + } + } + $ctr = 0; + my ($partlist,$handgrade) = &response_type($ENV{'form.url'}); + @parsedlist = reverse @parsedlist if ($button eq 'Previous'); + foreach my $student (@parsedlist) { + my ($uname,$udom) = split(/:/,$student); + if ($ENV{'form.submitonly'} eq 'yes') { + my (%status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname,$partlist) ; + my $statusflg = ''; + foreach (keys(%status)) { + $statusflg = 1 if ($status{$_} ne 'nothing'); + my ($foo,$partid,$foo1) = split(/\./,$_); + $statusflg = '' if ($status{'resource.'.$partid.'.submitted_by'} ne ''); + } + next if ($statusflg eq ''); + } + push @nextlist,$student if ($ctr < $ntstu); + $ctr++; + } + + $ctr = 0; + my $total = scalar(@nextlist)-1; + + foreach (sort @nextlist) { + my ($uname,$udom,$submitter) = split(/:/); + $ENV{'form.student'} = $uname; + $ENV{'form.fullname'} = $$fullname{$_}; +# $ENV{'form.'.$_.':submitted_by'} = $submitter; +# print "submitter=$ENV{'form.'.$_.':submitted_by'}= $submitter:
"; + &submission($request,$ctr,$total); + $ctr++; + } + if ($total < 0) { + my $the_end = '

LON-CAPA User Message


'."\n"; + $the_end.='Message: No more students for this section or class.

'."\n"; + $the_end.='Click on the button below to return to the grading menu.

'."\n"; + $the_end.=&show_grading_menu_form ($symb,$url); + $request->print($the_end); + } + return ''; } -sub gradingmenu { - my ($request) = @_; - my ($symb,$url)=&get_symb_and_url($request); - if (!$symb) {return '';} - - my $result='

 Select a Grading Method


'; - $result.='
'."\n"; - $result.=''."\n"; - $result.='
'."\n"; - $result.=' Resource : '.$url.'
'."\n"; - $result.='
'."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
'."\n"; - $result.='
'."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
'."\n"; - $result.='
'."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
'."\n"; - $result.='
'."\n"; - $result.='
'."\n"; - return $result; +sub saveHandGrade { + my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter) = @_; +# my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname); + my %newrecord; + foreach (split(/:/,$ENV{'form.partlist'.$newflg})) { + if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq 'excused') { + $newrecord{'resource.'.$_.'.solved'} = 'excused'; + } else { + my $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ? + $ENV{'form.GD_BOX'.$newflg.'_'.$_} : $ENV{'form.RADVAL'.$newflg.'_'.$_}); + if ($pts eq '') { + &userError($request,'No point was assigned for part id '.$_.' and for username '.$stuname.'.'); + return 'error'; + } + my $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 : $ENV{'form.WGT'.$newflg.'_'.$_}; + my $partial= $pts/$wgt; + $newrecord{'resource.'.$_.'.awarded'} = $partial; + if ($partial == 0) { + $newrecord{'resource.'.$_.'.solved'} = 'incorrect_by_override'; + } else { + $newrecord{'resource.'.$_.'.solved'} = 'correct_by_override'; + } + $newrecord{'resource.'.$_.'.submitted_by'} = $submitter if ($submitter); + } + } + + if ( scalar(keys(%newrecord)) > 0 ) { + $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; +# &print_hash($request,\%newrecord); + &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname); + } + return ''; } -sub viewgrades { - my ($request) = @_; - my $result=''; +sub get_symb_and_url { + my ($request) = @_; + (my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; + my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))); + if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; } + return ($symb,$url); +} + +sub show_grading_menu_form { + my ($symb,$url)=@_; + my $result.='
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + '
'."\n"; + return $result; +} - #get resource reference - my ($symb,$url)=&get_symb_and_url($request); - if (!$symb) {return '';} - #get classlist - my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); - #print "Found $cdom:$cnum
"; - my (%classlist) = &getclasslist($cdom,$cnum,'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"; - foreach my $part (sort(@parts)) { - my $display=&Apache::lonnet::metadata($url,$part.'.display'); - if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } - $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.='
UsernameNameDomain'.$display.'
'; +sub gradingmenu { + my ($request) = @_; + my ($symb,$url)=&get_symb_and_url($request); + if (!$symb) {return '';} + my $result='

 Select a Grading Method

'; + $result.=''; + $result.=''; + my ($partlist,$handgrade) = &response_type($url); + my ($resptype,$hdgrade)=('','no'); + for (sort keys(%$handgrade)) { + my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_}); + $resptype = $responsetype; + $hdgrade = $handgrade if ($handgrade eq 'yes'); + $result.=''. + ''. + ''; + } + $result.='
Resource: '.$url.'
Part ID: '.(split(/_/))[0].'Type: '.$responsetype.'Handgrade: '.$handgrade.'
'; + $result.=&view_edit_entire_class_form($symb,$url).'
'; + $result.=&upcsvScores_form($symb,$url).'
'; + $result.=&viewGradeaStu_form($symb,$url,$resptype,$hdgrade).'
'; + $result.=&verifyReceipt_form($symb,$url).'
'; + $result.=&view_classlist_form($symb,$url); + + return $result; +} + +sub view_classlist_form { + my ($symb,$url)=@_; + my $result.='
'."\n"; + $result.=''."\n"; + $result.='
'."\n"; + $result.=' View Class List
'."\n"; + $result.='
'."\n". + ''."\n". + ''."\n". + ''."\n"; + $result.=' 
'."\n"; + $result.='
'."\n"; + $result.='
'."\n"; + return $result; +} + +sub viewclasslist { + my ($request) = shift; + my ($coursedomain,$coursenum) = split(/_/,$ENV{'request.course.id'}); + my %classlist=&Apache::lonnet::dump('classlist',$coursedomain,$coursenum); + $request->print(''); + foreach (sort keys(%classlist)) { +# my ($unam,$udom) = split(/:/,$_,2); +# my $section = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'}); +# my $fullname = &get_fullname ($unam,$udom); +# my @uname; +# $uname[0]=$unam; +# my %userid=&Apache::lonnet::idrget($udom,@uname); +# my $value=$classlist{$_}.':'.$userid{$unam}.':'.$section.':'.$fullname; +# $classlist{$_}=$value; + $request->print(''); + } + $request->print('
'.$_.' 
 '.$classlist{$_}.'
'); +# my $putresult = &Apache::lonnet::put +# ('classlist',\%classlist, +# $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, +# $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - return $result; + return ''; } -sub editgrades { - my ($request) = @_; - my $result=''; - - 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'}); - #print "Found $cdom:$cnum
"; - my (%classlist) = &getclasslist($cdom,$cnum,'0'); - - #get list of parts for this problem - my (@parts) = &getpartlist($url); - - $result.='
'."\n". - ''."\n". - ''."\n". - ''."\n". - '
'."\n"; - - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { - $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts); - } - - $result.='
'; - return $result; -} - -sub csvupload { - my ($request)= @_; - my $result; - my ($symb,$url)=&get_symb_and_url($request); - if (!$symb) {return '';} - my $upfile_select=&Apache::loncommon::upfile_select_html(); +sub view_edit_entire_class_form { + my ($symb,$url)=@_; + my ($classlist,$sections) = &getclasslist('all','0'); + my $result.='
'."\n"; + $result.=''."\n"; + $result.='
'."\n"; + $result.=' View/Grade Entire Section/Class
'."\n"; + $result.='
'."\n". + ''."\n". + ''."\n". + ''."\n"; + $result.=' Select section: '."
\n"; + $result.=' 
'."\n"; + $result.='
'."\n"; + $result.='
'."\n"; + return $result; +} + +sub upcsvScores_form { + my ($symb,$url) = @_; + if (!$symb) {return '';} + my $result.='
'."\n"; + $result.=''."\n"; + $result.='
'."\n"; + $result.=' Specify a file containing the class scores for above resource
'."\n"; + my $upfile_select=&Apache::loncommon::upfile_select_html(); $result.=< -
-

Specify a file containing the class grades for resource $url

$upfile_select -

+
  + ENDUPFORM - return $result; + $result.='

'."\n"; + $result.='
'."\n"; + return $result; +} + +sub viewGradeaStu_form { + my ($symb,$url,$response,$handgrade) = @_; + my ($classlist,$sections) = &getclasslist('all','0'); + my $result.='
'."\n"; + $result.=''."\n"; + $result.='
'."\n"; + $result.=' View/Grade an Individual Student\'s Submission
'."\n"; + $result.='
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"; + + $result.=' Select section: '."\n"; + $result.='  Display students who has: '. + ' submitted'. + ' everybody
'; + $result.=' (Section "no" implies the students were not assigned a section.)
' + if (grep /no/,@$sections); + + $result.='
 '."\n". + '
'."\n"; + $result.='
'."\n"; + $result.='
'."\n"; + return $result; +} + +sub verifyReceipt_form { + my ($symb,$url) = @_; + my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"}; + my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"}; + my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}); + + my $result.='
'."\n"; + $result.=''."\n"; + $result.='
'."\n"; + $result.=' Verify a Submission Receipt Issued by this Server
'."\n"; + $result.='
'."\n"; + $result.=' '.$hostver.'-
'."\n"; + $result.=' '."\n"; + $result.=''."\n"; + if ($ENV{'form.url'}) { + $result.=''; + } + if ($ENV{'form.symb'}) { + $result.=''; + } + $result.='
'; + $result.='
'."\n"; + $result.='
'."\n"; + return $result; +} + +sub viewgrades_js { + my ($request) = shift; + + $request->print(< + function viewOneStudent(user) { + document.onestudent.student.value = user; + document.onestudent.submit(); + } + + function writePoint(partid,weight,point) { + var radioButton = eval("document.classgrade.RADVAL_"+partid); + var textbox = eval("document.classgrade.TEXTVAL_"+partid); + if (point == "textval") { + var point = eval("document.classgrade.TEXTVAL_"+partid+".value"); + if (isNaN(point) || point < 0) { + alert("A number equal or greater than 0 is expected. Entered value = "+point); + var resetbox = false; + for (var i=0; i +VIEWJAVASCRIPT +} + +sub viewgrades { + my ($request) = shift; + &viewgrades_js($request); + + my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'}); + my $result='

Manual Grading

'; + + $result.='Resource: '.$ENV{'form.url'}.''."\n"; + + #view individual student submission form - called using Javascript viewOneStudent + $result.= '
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + '
'."\n"; + + #start the form + $result.= '
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"; + + $result.='To assign the same score for all the students use the radio buttons or '. + 'text box below. To assign scores individually fill in the score boxes for '. + 'each student in the table below. A score that has already '. + 'been graded does not get changed using the radio buttons or text box. '. + 'If needed, it has to be changed individually.'; + + my ($partlist,$handgrade) = &response_type($ENV{'form.url'}); + my %weight = (); + my $ctsparts = 0; + $result.=''; + for (sort keys(%$handgrade)) { + my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_}); + my ($partid,$respid) = split (/_/); + my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb); + $weight{$partid} = $wgt eq '' ? '1' : $wgt; + + $result.=''."\n"; + $result.=''."\n"; + $result.= ''."\n"; + $ctsparts++; + } + $result.='
Part ID: '.$partid.'   '; + $result.=''; + my $ctr = 0; + while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across + $result.= '\n"; + $result.=(($ctr+1)%10 == 0 ? '' : ''); + $ctr++; + } + $result.='
'.$ctr."
'; + $result.= '		 or /'. + $weight{$partid}.' (problem weight)
'; + $result.='    '; +# $result.=''."\n"; + $result.= ''."\n"; + + $result.= '
'."\n". + ''. + ''."\n"; + #get list of parts for this problem + my (@parts) = sort(&getpartlist($url)); + foreach my $part (@parts) { + my $display=&Apache::lonnet::metadata($url,$part.'.display'); + next if ($display =~ /^Number of Attempts/); + if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } + if ($display =~ /^Partial Credit Factor/) { + $_ = $display; + my ($partid) = /.*?(\d+).*/; + $result.=''."\n"; + next; + } + $display =~ s/Problem Status/Grade Status
/; + $result.=''."\n"; + } + $result.=''; + #get info for each student + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0'); + my $ctr = 0; + foreach ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) { + (my $username = $_) = split(/:/); + $result.=''."\n"; + $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'}, + $_,$$fullname{$_},\@parts,\%weight); + $ctr++; + } + $result.='
UsernameFullnameDomainScore Part '.$partid.'
(weight = '. + $weight{$partid}.')		'.$display.'
'; + $result.=''."\n"; + $result.='
'; + $result.=&show_grading_menu_form($symb,$url); + return $result; +} + +sub viewstudentgrade { + my ($url,$symb,$courseid,$student,$fullname,$parts,$weight) = @_; + my ($username,$domain) = split(/:/,$student); + my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username); + my $result=''. + ''.$username.''. + ''.$fullname.''.$domain.''."\n"; + foreach my $part (@$parts) { + my ($temp,$part,$type)=split(/_/,$part); + my $score=$record{"resource.$part.$type"}; + next if $type eq 'tries'; + if ($type eq 'awarded') { + my $pts = $score eq '' ? '' : $score*$$weight{$part}; + $result.=''."\n"; + $result.=''."\n"; + } elsif ($type eq 'solved') { + my ($status,$foo)=split(/_/,$score,2); + $status = 'nothing' if ($status eq ''); + $result.=''."\n"; + $result.='\n"; + } + } + $result.=''; + return $result; +} + + +sub editgrades { + my ($request) = @_; + + my $symb=$ENV{'form.symb'}; + my $url =$ENV{'form.url'}; + my $result='

Current Grade Status

'; + $result.='Resource: '.$ENV{'form.url'}.'
'."\n"; + $result.='Section: '.$ENV{'form.section'}.''."\n"; + $result.= &show_grading_menu_form ($symb,$url); + $result.= '
'."\n"; + $result.= ''. + ''."\n"; + + my %scoreptr = ( + 'correct' =>'correct_by_override', + 'incorrect'=>'incorrect_by_override', + 'excused' =>'excused', + 'ungraded' =>'ungraded_attempted', + 'nothing' => '', + ); + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0'); + + my (@partid); + my %weight = (); + my ($i,$ctr) = (0,0); + while ($ctr < $ENV{'form.totalparts'}) { + my $partid = $ENV{'form.partid_'.$ctr}; + push @partid,$partid; + my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb); + $weight{$partid} = $wgt eq '' ? '1' : $wgt; + $ctr++; + $result .= ''; + } + $result .= ''; + foreach (@partid) { + $result .= ''. + ''; + } + $result .= ''."\n"; + + for ($i=0; $i<$ENV{'form.total'}; $i++) { + my $user = $ENV{'form.ctr'.$i}; + my %newrecord; + my $updateflag = 0; + my @userdom = grep /^$user:/,keys %$classlist; + my ($foo,$udom) = split(/:/,$userdom[0]); + + $result .= ''; + + foreach (@partid) { + my $old_aw = $ENV{'form.GD_'.$user.'_'.$_.'_aw_s'}; + my $old_part = $old_aw eq '' ? '' : $old_aw/$weight{$_}; + my $old_score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_sv_s'}}; + + my $awarded = $ENV{'form.GD_'.$user.'_'.$_.'_aw'}; + my $partial = $awarded eq '' ? '' : $awarded/$weight{$_}; + my $score; + if ($partial eq '') { + $score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_sv_s'}}; + } elsif ($partial > 0) { + $score = 'correct_by_override'; + } elsif ($partial == 0) { + $score = 'incorrect_by_override'; + } + $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_sv'} eq 'excused') && + ($score ne 'excused')); + $result .= ''. + ''; + + next if ($old_part eq $partial && $old_score eq $score); + + $updateflag = 1; + $newrecord{'resource.'.$_.'.awarded'} = $partial if $partial ne ''; + $newrecord{'resource.'.$_.'.solved'} = $score; + + } + $result .= ''."\n"; + if ($updateflag) { + $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; + &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'}, + $udom,$user); + } + } + $result .= '
UsernameFullnamePart ID '.$partid. + ' (Weight = '.$weight{$partid}.')
 Old Score  New Score 
'.$user.' '. + $$fullname{$userdom[0]}.' '.$old_aw.' '.$awarded. + ($score eq 'excused' ? $score : '').' 
'."\n"; + return $result; +} + + +#FIXME need to look at the metadata 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 =''; + my ($stuname,$domain) = split(/:/,$student); + 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{"form.GD.$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 { + 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; +} + + +sub sub_page_js { + my $request = shift; + $request->print(< + function updateRadio(radioButton,formtextbox,formsel,scores) { + var pts = formtextbox.value; + var resetbox =false; + if (isNaN(pts) || pts < 0) { + alert("A number equal or greater than 0 is expected. Entered value = "+pts); + for (var i=0; i"+msgchk); + re = /msgsub/; + var shwsel = ""; + if (re.test(msgchk)) { shwsel = "checked" } + displaySubject(subject,shwsel); + for (var i=1; i<=Nmsg; i++) { + var testpt = "savemsg"+i+","; + re = /testpt/; + shwsel = ""; + if (re.test(msgchk)) { shwsel = "checked" } + var message = eval("document.SCORE.savemsg"+i+".value"); + displaySavedMsg(i,message,shwsel); + } + newmsg = eval("document.SCORE.newmsg"+usrctr+".value"); + shwsel = ""; + re = /newmsg/; + if (re.test(msgchk)) { shwsel = "checked" } + newMsg(newmsg,shwsel); + msgTail(); + return; + } + + function savedMsgHeader(Nmsg,usrctr,fullname) { + var height = 30*Nmsg+250; + var scrollbar = "no"; + if (height > 600) { + height = 600; + scrollbar = "yes"; + } +/* if (window.pWin) + window.pWin.close(); */ + pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx=70,screeny=75,width=600,height='+height); + pWin.document.write(""); + pWin.document.write("Message Central"); + + pWin.document.write(" +SUBJAVASCRIPT } sub csvupload_javascript_reverse_associate { @@ -541,15 +1840,15 @@ ENDPICK } sub csvuploadmap_header { - my ($request,$symb,$url,$datatoken,$distotal)= @_; - my $result; - my $javascript; - if ($ENV{'form.upfile_associate'} eq 'reverse') { - $javascript=&csvupload_javascript_reverse_associate(); - } else { - $javascript=&csvupload_javascript_forward_associate(); - } - $request->print(<print(<

Uploading Class Grades for resource $url

@@ -573,28 +1872,28 @@ to this page if the data selected is ins $javascript ENDPICK - return ''; +return ''; } sub csvupload_fields { - my ($url) = @_; - my (@parts) = &getpartlist($url); - my @fields=(['username','Student Username'],['domain','Student Domain']); - foreach my $part (sort(@parts)) { - my @datum; - my $display=&Apache::lonnet::metadata($url,$part.'.display'); - my $name=$part; - if (!$display) { $display = $name; } - @datum=($name,$display); - push(@fields,\@datum); - } - return (@fields); + my ($url) = @_; + my (@parts) = &getpartlist($url); + my @fields=(['username','Student Username'],['domain','Student Domain']); + foreach my $part (sort(@parts)) { + my @datum; + my $display=&Apache::lonnet::metadata($url,$part.'.display'); + my $name=$part; + if (!$display) { $display = $name; } + @datum=($name,$display); + push(@fields,\@datum); + } + return (@fields); } sub csvuploadmap_footer { - my ($request,$i,$keyfields) =@_; - $request->print(<print(< @@ -604,178 +1903,206 @@ ENDPICK } sub csvuploadmap { - my ($request)= @_; - my ($symb,$url)=&get_symb_and_url($request); - if (!$symb) {return '';} - my $datatoken; - if (!$ENV{'form.datatoken'}) { - $datatoken=&Apache::loncommon::upfile_store($request); - } else { - $datatoken=$ENV{'form.datatoken'}; - &Apache::loncommon::load_tmp_file($request); - } - my @records=&Apache::loncommon::upfile_record_sep(); - &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1); - my $i; - my $keyfields; - if (@records) { - my @fields=&csvupload_fields($url); - if ($ENV{'form.upfile_associate'} eq 'reverse') { - &Apache::loncommon::csv_print_samples($request,\@records); - $i=&Apache::loncommon::csv_print_select_table($request,\@records, - \@fields); - foreach (@fields) { $keyfields.=$_->[0].','; } - chop($keyfields); + my ($request)= @_; + my ($symb,$url)=&get_symb_and_url($request); + if (!$symb) {return '';} + my $datatoken; + if (!$ENV{'form.datatoken'}) { + $datatoken=&Apache::loncommon::upfile_store($request); } else { - unshift(@fields,['none','']); - $i=&Apache::loncommon::csv_samples_select_table($request,\@records, - \@fields); - my %sone=&Apache::loncommon::record_sep($records[0]); - $keyfields=join(',',sort(keys(%sone))); + $datatoken=$ENV{'form.datatoken'}; + &Apache::loncommon::load_tmp_file($request); } - } - &csvuploadmap_footer($request,$i,$keyfields); - return ''; + my @records=&Apache::loncommon::upfile_record_sep(); + &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1); + my ($i,$keyfields); + if (@records) { + my @fields=&csvupload_fields($url); + if ($ENV{'form.upfile_associate'} eq 'reverse') { + &Apache::loncommon::csv_print_samples($request,\@records); + $i=&Apache::loncommon::csv_print_select_table($request,\@records, + \@fields); + foreach (@fields) { $keyfields.=$_->[0].','; } + chop($keyfields); + } else { + unshift(@fields,['none','']); + $i=&Apache::loncommon::csv_samples_select_table($request,\@records, + \@fields); + my %sone=&Apache::loncommon::record_sep($records[0]); + $keyfields=join(',',sort(keys(%sone))); + } + } + &csvuploadmap_footer($request,$i,$keyfields); + return ''; } sub csvuploadassign { - my ($request)= @_; - my ($symb,$url)=&get_symb_and_url($request); - if (!$symb) {return '';} - &Apache::loncommon::load_tmp_file($request); - my @gradedata=&Apache::loncommon::upfile_record_sep(); - my @keyfields = split(/\,/,$ENV{'form.keyfields'}); - my %fields=(); - for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) { - if ($ENV{'form.upfile_associate'} eq 'reverse') { - if ($ENV{'form.f'.$i} ne 'none') { - $fields{$keyfields[$i]}=$ENV{'form.f'.$i}; - } - } else { - if ($ENV{'form.f'.$i} ne 'none') { - $fields{$ENV{'form.f'.$i}}=$keyfields[$i]; - } + my ($request)= @_; + my ($symb,$url)=&get_symb_and_url($request); + if (!$symb) {return '';} + &Apache::loncommon::load_tmp_file($request); + my @gradedata=&Apache::loncommon::upfile_record_sep(); + my @keyfields = split(/\,/,$ENV{'form.keyfields'}); + my %fields=(); + for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) { + if ($ENV{'form.upfile_associate'} eq 'reverse') { + if ($ENV{'form.f'.$i} ne 'none') { + $fields{$keyfields[$i]}=$ENV{'form.f'.$i}; + } + } else { + if ($ENV{'form.f'.$i} ne 'none') { + $fields{$ENV{'form.f'.$i}}=$keyfields[$i]; + } + } } - } - $request->print('

Assigning Grades

'); - &Apache::lonhomework::showhash(('1'=>\@keyfields)); - &Apache::lonhomework::showhash(%fields); - my $courseid=$ENV{'request.course.id'}; - my $cdom=$ENV{"course.$courseid.domain"}; - my $cnum=$ENV{"course.$courseid.num"}; - my (%classlist) = &getclasslist($cdom,$cnum,'1'); - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { - my %newhash; + $request->print('

Assigning Grades

'); + my $courseid=$ENV{'request.course.id'}; +# my $cdom=$ENV{"course.$courseid.domain"}; +# my $cnum=$ENV{"course.$courseid.num"}; + my ($classlist) = &getclasslist('all','1'); + my @skipped; + my $countdone=0; foreach my $grade (@gradedata) { - my %entries=&Apache::loncommon::record_sep($grade); - foreach my $dest (keys(%fields)) { - - } + my %entries=&Apache::loncommon::record_sep($grade); + my $username=$entries{$fields{'username'}}; + my $domain=$entries{$fields{'domain'}}; + if (!exists($$classlist{"$username:$domain"})) { + push(@skipped,"$username:$domain"); + next; + } + my %grades; + foreach my $dest (keys(%fields)) { + if ($dest eq 'username' || $dest eq 'domain') { next; } + if ($entries{$fields{$dest}} eq '') { next; } + my $store_key=$dest; + $store_key=~s/^stores/resource/; + $store_key=~s/_/\./g; + $grades{$store_key}=$entries{$fields{$dest}}; + } + $grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}"; + &Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'}, + $domain,$username); + $request->print('.'); + $request->rflush(); + $countdone++; + } + $request->print("
Stored $countdone students\n"); + if (@skipped) { + $request->print('
Skipped Students
'); + foreach my $student (@skipped) { $request->print("
$student"); } } - } + $request->print(&view_edit_entire_class_form($symb,$url)); + $request->print(&show_grading_menu_form($symb,$url)); + return ''; } sub send_header { - my ($request)= @_; - $request->print(&Apache::lontexconvert::header()); + my ($request)= @_; + $request->print(&Apache::lontexconvert::header()); # $request->print(" #"); - $request->print(''); + $request->print(''); } sub send_footer { - my ($request)= @_; - $request->print(''); - $request->print(&Apache::lontexconvert::footer()); + my ($request)= @_; + $request->print(''); + $request->print(&Apache::lontexconvert::footer()); } sub handler { - my $request=$_[0]; - - if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;} - - if ($ENV{'browser.mathml'}) { - $request->content_type('text/xml'); - } else { - $request->content_type('text/html'); - } - $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 '') { - 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.'

'); - } + my $request=$_[0]; + + if ($ENV{'browser.mathml'}) { + $request->content_type('text/xml'); + } else { + $request->content_type('text/html'); + } + $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 '') { + 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('

Not a valid DocID: '.$token.'

'); - } - } else { - $request->print(&Apache::lonxml::tokeninputfield()); - } - } - } else { - &Apache::lonhomework::showhashsubset(\%ENV,'^form'); - $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); - if ($command eq 'submission') { - &listStudents($request) if ($ENV{'form.student'} eq ''); - $request->print(&submission($request)) if ($ENV{'form.student'} ne ''); - } elsif ($command eq 'gradingmenu') { - $request->print(&gradingmenu($request)); - } elsif ($command eq 'viewgrades') { - $request->print(&viewgrades($request)); - } elsif ($command eq 'editgrades') { - $request->print(&editgrades($request)); - } elsif ($command eq 'verify') { - $request->print(&verifyreceipt($request)); - } elsif ($command eq 'csvupload') { - $request->print(&csvupload($request)); - } elsif ($command eq 'csvuploadmap') { - $request->print(&csvuploadmap($request)); - } elsif ($command eq 'csvuploadassign') { - if ($ENV{'form.associate'} ne 'Reverse Association') { - $request->print(&csvuploadassign($request)); - } else { - if ( $ENV{'form.upfile_associate'} ne 'reverse' ) { - $ENV{'form.upfile_associate'} = 'reverse'; - } else { - $ENV{'form.upfile_associate'} = 'forward'; + $request->print(&Apache::lonxml::tokeninputfield()); + } } - $request->print(&csvuploadmap($request)); - } } else { - $request->print("Unknown action: $command:"); + #&Apache::lonhomework::showhashsubset(\%ENV,'^form'); + $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); + if ($command eq 'submission') { + &listStudents($request) if ($ENV{'form.student'} eq ''); + &submission($request,0,0) if ($ENV{'form.student'} ne ''); + } elsif ($command eq 'processGroup') { + &processGroup($request); + } elsif ($command eq 'gradingmenu') { + $request->print(&gradingmenu($request)); + } elsif ($command eq 'viewgrades') { + $request->print(&viewgrades($request)); + } elsif ($command eq 'handgrade') { + $request->print(&processHandGrade($request)); + } elsif ($command eq 'editgrades') { + $request->print(&editgrades($request)); + } elsif ($command eq 'verify') { + $request->print(&verifyreceipt($request)); + } elsif ($command eq 'csvupload') { + $request->print(&csvupload($request)); + } elsif ($command eq 'viewclasslist') { + $request->print(&viewclasslist($request)); + } elsif ($command eq 'csvuploadmap') { + $request->print(&csvuploadmap($request)); +# } elsif ($command eq 'receiptInput') { +# &receiptInput($request); + } elsif ($command eq 'csvuploadassign') { + if ($ENV{'form.associate'} ne 'Reverse Association') { + $request->print(&csvuploadassign($request)); + } else { + if ( $ENV{'form.upfile_associate'} ne 'reverse' ) { + $ENV{'form.upfile_associate'} = 'reverse'; + } else { + $ENV{'form.upfile_associate'} = 'forward'; + } + $request->print(&csvuploadmap($request)); + } + } else { + $request->print("Unknown action: $command:"); + } } - } - &send_footer($request); - return OK; + &send_footer($request); + return OK; } 1;