--- loncom/homework/grades.pm 2002/06/20 22:04:21 1.29 +++ loncom/homework/grades.pm 2002/06/25 21:07:56 1.31 @@ -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.31 2002/06/25 21:07:56 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,24 @@ ENDHEADER $request->print( ''); } +# $request->print(<print(''); + 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 +145,32 @@ 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(''); $request->print( - ''); + ''); # $request->print(''); } @@ -201,7 +221,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); } } @@ -224,44 +244,33 @@ 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) { @@ -304,12 +313,19 @@ sub setstudentgrade { return $result; } +# -- show submissions of a student, option to grade +# sub submission { my ($request) = @_; + $request->print(< + function changeRadio(title,url) { + } + +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; @@ -319,17 +335,70 @@ sub submission { $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 ProblemSubmissionsAction
$sname$fullname$sdom". + $request->print("\n".'
$sname$fullname$sdom
'. + ' no '. + ' yes '. + ' last '. + ' all '); $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 $maxpt = &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; + + $result.= '
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''; + $result.=''."\n"; + $result.='\n"; + } + } + $result.='
Points'; + my $ctr = 0; + while ($ctr<=$maxpt) { + $result.= ' '.$ctr."\n"; + $ctr++; + } + $result.=' or /'.$maxpt.' (max pts)'; + + 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.="
The buttons do not work yet. '; + $result.=' '; + $result.=' '; + $result.='
'; return $result; } @@ -349,7 +418,7 @@ sub view_edit_entire_class_form { ''."\n". ''."\n". ''."\n". - ''."\n". + ''."\n". ''."\n"; return $result; } @@ -386,7 +455,13 @@ sub gradingmenu { ''."\n". ''."\n". ''."\n". - ''."\n". + ''."\n". + ''."\n"; + $result.='
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". '
'."\n"; $result.='
'."\n"; $result.=''."\n"; @@ -424,14 +499,18 @@ sub viewgrades { 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.=''.$display.''."\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.=''; + $result.=''; + $result.=''; $result.=&show_grading_menu_form($symb,$url); return $result; } @@ -797,6 +876,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));