--- loncom/homework/grades.pm 2002/06/26 21:25:31 1.32 +++ loncom/homework/grades.pm 2002/06/27 21:34:18 1.33 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.32 2002/06/26 21:25:31 ng Exp $ +# $Id: grades.pm,v 1.33 2002/06/27 21:34:18 ng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -87,6 +87,7 @@ sub verifyreceipt { } } $request->printf('

'.$matches." match%s

",$matches <= 1 ? '' : 'es'); +# needs to print who is matched } return ''; } @@ -183,8 +184,8 @@ ENDTABLEST ' no '. ' yes '); $request->print(''. - ' last '. - ' all '); + ' last '. + ' all '); my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname); $request->print( ''.$status.' '); @@ -272,7 +273,7 @@ sub viewstudentgrade { my ($status,$foo)=split(/_/,$score,2); $result.="'."\n". ''."\n". - ''."\n"; - + ''."\n". + ''."\n". + ''."\n". + ''."\n"; + + my $counter = 0; + $result.=''. + ''."\n"; $result.=''; - $result.=''."\n"; - $result.=''; + 'onChange="javascript:updateRadio(this.form.RADVAL'.$counter. + ',this.form.GRADE_BOX'.$counter. + ',this.form.GRADE_SEL'.$counter.',\''.$wgt.'\')" />'."\n"; + $result.='\n"; + } + } - $result.=''."\n"; - $result.='
Points'; my $ctr = 0; while ($ctr<=$wgt) { - $result.= ' '.$ctr."\n"; + $result.= ' '.$ctr."\n"; $ctr++; } $result.=' or /'.$wgt.' (problem weight)
/'.($wgt > 0 ? $wgt.' (problem weight)' : 'invalid problem weight' ). + ' '; + + foreach my $part (&getpartlist($url)) { + my ($temp,$part,$type)=split(/_/,$part); + if ($type eq 'solved') { + my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2); + $result.='
 '; + $result.='
'; + my $ntstu =''."\n"; + my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1'); + $ntstu =~ s/
'; return $result; } sub processHandGrade { - my ($url,$symb,$courseid,$student,@parts) = @_; + my ($request) = @_; + my $result=''; - my ($stuname,$domain) = split(/:/,$student); - my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname); + 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 $vProb = $ENV{'form.vProb'}; + my $lastSub= $ENV{'form.lastSub'}; + + my (@parts) = sort(&getpartlist($url)); + if ($button eq 'Save & Next') { + my $ctr = 0; + while ($ctr < $ENV{'form.NCT'}) { + my $pts = ($ENV{'form.GRADE_BOX'.$ctr} ne '' ? $ENV{'form.GRADE_BOX'.$ctr} : $ENV{'form.RADVAL'.$ctr}); + my $wgt = $ENV{'form.WGT'.$ctr}; + my $sel = $ENV{'form.GRADE_SEL'.$ctr}; + my $score = $pts/$wgt if ($wgt != 0); + my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr}); + &saveHandGrade($url,$symb,$uname,$udom,$score,@parts); + $ctr++; + } + } + my $firststu = $ENV{'form.unamedom0'}; + my $laststu = $ENV{'form.unamedom'.($ngrade-1)}; + + #get classlist + my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); + my (%classlist) = &getclasslist($cdom,$cnum,'0'); + + my (@nextlist,@prevlist); + my ($nextflg,$prevflg,$ctr) = (0,0,0); + foreach my $student ( sort(@{ $classlist{'allids'} }) ) { + my ($uname,$udom) = split(/:/,$student); + if ($nextflg == 1 && $button =~ /Next$/) { + push @nextlist,$uname if ($ctr < $ENV{'form.NTSTU'}); + $ctr++; + } + $nextflg = 1 if ($student eq $laststu); + $prevflg = 1 if ($student eq $firststu); + } + foreach my $student (@nextlist) { + $ENV{'form.student'} = $student; + $request->print(&submission($request)); + } + $request->print ("

Grading

"); + + #get info for each student + foreach my $student ( sort(@{ $classlist{'allids'} }) ) { + my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts); + print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:
\n"; +# $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts); + } + + return 'The End'; +# return $result; +} + +sub saveHandGrade { + my ($url,$symb,$stuname,$domain,$newscore,@parts) = @_; + +# my ($stuname,$domain) = split(/:/,$student); + my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname); my %newrecord; foreach my $part (@parts) { my ($temp,$part,$type)=split(/_/,$part); my $oldscore=$record{"resource.$part.$type"}; - my $newscore=($ENV{'form.GRADE_BOX'} ne '' ? $ENV{"form.GRADE_BOX"} : $ENV{'form.radval'}); if ($type eq 'solved') { my $update=0; if ($newscore eq 'nothing' ) { @@ -463,23 +573,24 @@ sub processHandGrade { if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; } if ($newscore eq 'excused') { $newscore = 'excused'; } if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; } - if ($newscore eq 'handgraded') { $newscore = 'handgraded_by_grader'; } + if ($newscore eq 'partial') { $newscore = 'partial_correct'; } } if ($update) { $newrecord{"resource.$part.$type"}=$newscore; } } else { if ($oldscore ne $newscore) { $newrecord{"resource.$part.$type"}=$newscore; + } } - } - if ( scalar(keys(%newrecord)) > 0 ) { - $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; - print "grader=$newrecord{'resource.regrader'}:
records
"; - while (my ($k,$v) = each %newrecord) { - print "k=$k:v=$v:
\n"; + if ( scalar(keys(%newrecord)) > 0 ) { + $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; +# print "grader=$newrecord{'resource.regrader'}:
records
"; +# while (my ($k,$v) = each %newrecord) { +# print "k=$k:v=$v:
\n"; +# } +# &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname); } - &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname); + return ''; } - return ''; } sub get_symb_and_url { @@ -949,6 +1060,8 @@ sub handler { $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') {