--- loncom/homework/grades.pm 2002/06/25 21:07:56 1.31 +++ loncom/homework/grades.pm 2002/06/26 21:25:31 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.31 2002/06/25 21:07:56 ng Exp $ +# $Id: grades.pm,v 1.32 2002/06/26 21:25:31 ng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -116,6 +116,21 @@ ENDHEADER return ''; } +sub student_gradeStatus { + my ($url,$udom,$uname) = @_; + 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); + foreach my $part (&getpartlist($url)) { + my ($temp,$part,$type)=split(/_/,$part); + if ($type eq 'solved') { + my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2); + $status = 'nothing' if ($status eq ''); + return $type,$status; + } + } + return ''; +} + sub listStudents { my ($request) = shift; my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"}; @@ -124,11 +139,12 @@ sub listStudents { $request->print(<Show Student Submissions on Assessment -
+
- + - + + ENDTABLEST my (%classlist) = &getclasslist($cdom,$cnum,'0'); foreach my $student ( sort(@{ $classlist{'allids'} }) ) { @@ -145,7 +161,7 @@ ENDTABLEST $fullname.=$name{'firstname'}.' '.$name{'middlename'}; } if ( $Apache::grades::viewgrades eq 'F' ) { - $request->print("\n".''."". + $request->print("\n".''."". ''); if ($ENV{'form.url'}) { $request->print( @@ -169,6 +185,9 @@ ENDTABLEST $request->print(''); + my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname); + $request->print( + ''); $request->print( ''); @@ -237,6 +256,7 @@ sub viewstudentgrade { 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'}; @@ -277,6 +297,7 @@ sub setstudentgrade { my ($temp,$part,$type)=split(/_/,$part); my $oldscore=$record{"resource.$part.$type"}; my $newscore=$ENV{"form.GRADE.$student.$part.$type"}; + print "old=$oldscore:new=$newscore:
"; if ($type eq 'solved') { my $update=0; if ($newscore eq 'nothing' ) { @@ -305,7 +326,11 @@ sub setstudentgrade { } } if ( scalar(keys(%newrecord)) > 0 ) { - $newrecord{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}"; + $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); $result.="Stored away ".scalar(keys(%newrecord))." elements.
\n"; @@ -313,14 +338,40 @@ sub setstudentgrade { return $result; } -# -- show submissions of a student, option to grade +# --------------------------- show submissions of a student, option to grade -------- # sub submission { my ($request) = @_; $request->print(< - function changeRadio(title,url) { + JAVASCRIPT my $url=$ENV{'form.url'}; @@ -328,12 +379,8 @@ JAVASCRIPT 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; - if ($ENV{'form.symb'}) { - $symb=$ENV{'form.symb'}; - } else { - $symb=&Apache::lonnet::symbread($url); - } + + 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 ''; } # # header info @@ -347,7 +394,7 @@ JAVASCRIPT $ENV{'request.course.id'}); my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom, $ENV{'request.course.id'}); - $result.='
Resource: $ENV{'form.url'}
Resource: $ENV{'form.url'}
UsernameNameDomainView ProblemSubmissionsAction
View ProblemSubmissionsGrade StatusAction
$sname$fullname$sdom
$sname$fullname$sdom
'. ' last '. ' all '.$status.' '); $request->print('
'; + $result.='
'; $result.='
'; $result.='Student\'s view of the problem
'.$rendered.'
'; $result.='Correct answer:
'.$companswer; @@ -360,54 +407,88 @@ JAVASCRIPT $ENV{'request.course.id'},$last); $result.=$answer; - my $maxpt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname); + my $wgt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname); my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); - my $score = $record{'resource.0.awarded'}*$maxpt; + my $score = $record{'resource.0.awarded'}*$wgt; $result.= '
'."\n". ''."\n". ''."\n". - ''."\n". - '
Points'; + ''."\n"; + + $result.=''; - $result.=''."\n"; - $result.=''."\n"; + $result.=''; - 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.="\n"; - } - } - $result.='
Points'; my $ctr = 0; - while ($ctr<=$maxpt) { + while ($ctr<=$wgt) { $result.= ' '.$ctr."\n"; $ctr++; } $result.=' or /'.$maxpt.' (max pts)'; + $result.='/'.$wgt.' (problem weight)
The buttons do not work yet. '; + $result.=''."\n"; + $result.='
 '; $result.=' '; $result.=' '; $result.='
'; return $result; } +sub processHandGrade { + my ($url,$symb,$courseid,$student,@parts) = @_; + + 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.GRADE_BOX'} ne '' ? $ENV{"form.GRADE_BOX"} : $ENV{'form.radval'}); + if ($type eq 'solved') { + my $update=0; + if ($newscore eq 'nothing' ) { + if ($oldscore ne '') { + $update=1; + $newscore = ''; + } + } elsif ($oldscore !~ m/^$newscore/) { + $update=1; + 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'; } + if ($newscore eq 'handgraded') { $newscore = 'handgraded_by_grader'; } + } + 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"; + } + &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname); + } + return ''; +} + 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); } +# my $symb=$ENV{'form.symb'}; +# if (!$symb) { $symb=&Apache::lonnet::symbread($url); } + 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); } @@ -440,7 +521,7 @@ sub gradingmenu { if (!$symb) {return '';} my $result='

 Select a Grading Method


'; - $result.='
'."\n"; + $result.='
'."\n"; $result.=''."\n"; $result.='
'."\n"; $result.=' Resource : '.$url.'
'."\n"; @@ -493,7 +574,7 @@ sub viewgrades { ''."\n". ''."\n". ''."\n". - '
'."\n". + '
'."\n". ''."\n". ''."\n"; foreach my $part (@parts) {
UsernameNameDomain