--- loncom/homework/grades.pm 2002/06/20 22:04:21 1.29 +++ 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.29 2002/06/20 22:04:21 albertel Exp $ +# $Id: grades.pm,v 1.32 2002/06/26 21:25:31 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 2002 H.K. Ng +# package Apache::grades; use strict; @@ -83,12 +86,12 @@ sub verifyreceipt { $matches++; } } - $request->print('

'.$matches.' match(es)

'); + $request->printf('

'.$matches." match%s

",$matches <= 1 ? '' : 'es'); } return ''; } -sub listStudents { +sub receiptInput { my ($request) = shift; my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"}; my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"}; @@ -108,13 +111,40 @@ ENDHEADER $request->print( ''); } +# $request->print(<print(''); + 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"}; + my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"}; + $request->print(<

Show Student Submissions on Assessment

-
+
- + + + + ENDTABLEST my (%classlist) = &getclasslist($cdom,$cnum,'0'); foreach my $student ( sort(@{ $classlist{'allids'} }) ) { @@ -131,26 +161,35 @@ ENDTABLEST $fullname.=$name{'firstname'}.' '.$name{'middlename'}; } if ( $Apache::grades::viewgrades eq 'F' ) { - $request->print("\n".''."'."". ''); if ($ENV{'form.url'}) { $request->print( - ''); + ''); } if ($ENV{'form.symb'}) { $request->print( - ''); + ''); } $request->print( - ''); + ''); $request->print( - ''); + ''); $request->print( - ''); + ''); $request->print( - ''); + ''); + $request->print(''); + $request->print(''); + my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname); $request->print( - ''); + ''); + $request->print( + ''); # $request->print(''); } @@ -201,7 +240,7 @@ sub getpartlist { my @parts =(); my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys')); foreach my $key (@metakeys) { - if ( $key =~ m/stores_([0-9]+)_.*/ ) { + if ( $key =~ m/stores_([0-9]+)_.*/) { push(@parts,$key); } } @@ -217,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'}; @@ -224,50 +264,40 @@ sub viewstudentgrade { $result.="\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" + my $score=$record{"resource.$part.$type"}; + if ($type eq 'awarded' || $type eq 'tries') { + $result.=''."\n"; } elsif ($type eq 'solved') { - my $score=$record{"resource.$part.$type"}; + my ($status,$foo)=split(/_/,$score,2); $result.="\n"; } } $result.=''; return $result; } -#FIXME need to look at the meatdata spec on what type of data to accept and provide an + +#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.GRADE.$student.$part.$type"}; + print "old=$oldscore:new=$newscore:
"; if ($type eq 'solved') { my $update=0; if ($newscore eq 'nothing' ) { @@ -296,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"; @@ -304,41 +338,157 @@ sub setstudentgrade { return $result; } +# --------------------------- show submissions of a student, option to grade -------- +# sub submission { my ($request) = @_; + $request->print(< + function updateRadio() { + var pts = document.SCORE.GRADE_BOX.value; + var radioButton = document.SCORE.radval; + var checked =true; + var unchecked=false; + 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 +JAVASCRIPT 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); - } + + 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 $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, - $ENV{'request.course.id'}); +# +# header info 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, + $result.='
UsernameNameDomain 
Resource: $ENV{'form.url'}
UsernameNameDomainView ProblemSubmissionsGrade StatusAction
$sname$fullname$sdom". + $request->print("\n".'
$sname$fullname$sdom
'. + ' no '. + ' yes '. + ' last '. + ' all '.$status.' '); $request->print('
$username$fullname$domain
'; + $result.='
Username: '.$uname.'Fullname: '.$ENV{'form.fullname'}.'Domain: '.$udom.'
Resource: '.$url.'
'; +# +# option to display problem + if ($ENV{'form.vProb'} eq 'yes') { + 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'}); + my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom, + $ENV{'request.course.id'}); + $result.='
'; + $result.='
'; + $result.='Student\'s view of the problem
'.$rendered.'
'; + $result.='Correct answer:
'.$companswer; + $result.='
'; + $result.='

'; + } + my $last = ''; + $last = 'last' if ($ENV{'form.submission'} eq 'last'); + my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, + $ENV{'request.course.id'},$last); $result.=$answer; + + 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'}*$wgt; + + $result.= '
'."\n". + ''."\n". + ''."\n". + ''."\n"; + + $result.=''; + $result.=''."\n"; + $result.=''; + + $result.=''."\n"; + $result.='
Points'; + my $ctr = 0; + while ($ctr<=$wgt) { + $result.= ' '.$ctr."\n"; + $ctr++; + } + $result.=' or /'.$wgt.' (problem weight)
 '; + $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); } @@ -349,7 +499,7 @@ sub view_edit_entire_class_form { ''."\n". ''."\n". ''."\n". - ''."\n". + ''."\n". ''."\n"; return $result; } @@ -371,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"; @@ -386,7 +536,13 @@ sub gradingmenu { ''."\n". ''."\n". ''."\n". - ''."\n". + ''."\n". + ''."\n"; + $result.='
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". '
'."\n"; $result.='
'."\n"; $result.='
'."\n"; @@ -418,20 +574,24 @@ sub viewgrades { ''."\n". ''."\n". ''."\n". - '
'."\n". + '
'."\n". ''."\n". ''."\n"; foreach my $part (@parts) { my $display=&Apache::lonnet::metadata($url,$part.'.display'); if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } + print "Manual grading:$url:$part:$display:
"; $result.=''."\n"; - } + } $result.=''; #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); } - $result.='
UsernameNameDomain'.$display.'
'; + $result.='
'; + $result.=''; $result.=&show_grading_menu_form($symb,$url); return $result; } @@ -797,6 +957,8 @@ sub handler { $request->print(&csvupload($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));