--- loncom/homework/grades.pm 2002/06/24 21:05:12 1.30 +++ loncom/homework/grades.pm 2002/07/01 21:20:29 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.30 2002/06/24 21:05:12 ng Exp $ +# $Id: grades.pm,v 1.34 2002/07/01 21:20:29 ng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,8 +65,8 @@ sub moreinfo { 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'}; $receipt=~s/[^\-\d]//g; @@ -77,8 +77,8 @@ 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)) { @@ -87,97 +87,112 @@ sub verifyreceipt { } } $request->printf('

'.$matches." match%s

",$matches <= 1 ? '' : 'es'); +# needs to print who is matched } return ''; } -sub receiptInput { - 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(<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 = 'partial' if ($foo =~ /^partially/); + $status = 'nothing' if ($status eq ''); + return $type,$status; + } + } + return ''; +} + +sub get_fullname { + my ($sname,$sdom) = @_; + 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) { + $fullname=$name{'lastname'}.$name{'generation'}; + if ($fullname =~ /[^\s]+/) { $fullname.=', '; } + $fullname.=$name{'firstname'}.' '.$name{'middlename'}; + } + return $fullname; } sub listStudents { my ($request) = shift; - my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"}; - my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"}; + my $cdom =$ENV{"course.$ENV{'request.course.id'}.domain"}; + my $cnum =$ENV{"course.$ENV{'request.course.id'}.num"}; + my $getsec =$ENV{'form.section'}; + my $submitonly=$ENV{'form.submitonly'}; $request->print(<Show Student Submissions on Assessment - -\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) = @_; - + print "set student grade parts=@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' ) { @@ -298,10 +306,11 @@ sub setstudentgrade { } elsif ($oldscore !~ m/^$newscore/) { $update=1; $result.="Updating $stuname to $newscore
\n"; - if ($newscore eq 'correct') { $newscore = 'correct_by_override'; } + 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 'excused') { $newscore = 'excused'; } + if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; } + if ($newscore eq 'partial') { $newscore = 'correct_partially_by_override'; } } else { #$result.="$stuname:$part:$type:unchanged $oldscore to $newscore:
\n"; } @@ -316,89 +325,329 @@ sub setstudentgrade { } } if ( scalar(keys(%newrecord)) > 0 ) { - $newrecord{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}"; - &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname); + $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"; } return $result; } +# +# --------------------------- show submissions of a student, option to grade -------- sub submission { - my ($request) = @_; - my $url=$ENV{'form.url'}; - $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; + my ($request,$counter,$total) = @_; + + if ($counter == 0) { + $request->print(< + function updateRadio(radioButton,formtextbox,formsel,wgt) { + 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 0 && pts < wgt) { + formsel[4].selected = true; + } + if (pts == wgt) { + formsel[0].selected = true; + } + return; + } + + +JAVASCRIPT +} + (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 ''; } -# 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 $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : ''); +# +# header info + if ($counter == 0) { + $request->print('

Submission Record

'); + } - my $result='

Submission Record

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

 View Submissions for a Student or a Group of Students

+ Resource: $ENV{'form.url'}

+
 View Options
+ View Problem: no + yes +   Submissions: last + all + + +
Resource: $ENV{'form.url'}
UsernameNameDomainView ProblemSubmissionsAction
+ + + + ENDTABLEST - my (%classlist) = &getclasslist($cdom,$cnum,'0'); - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { + if ($ENV{'form.url'}) { + $request->print(''."\n"); + } + if ($ENV{'form.symb'}) { + $request->print(''."\n"); + } + $request->print(''."\n"); + + my ($classlist) = &getclasslist($getsec,'0'); + foreach my $student ( sort(@{ $$classlist{$getsec} }) ) { my ($sname,$sdom) = split(/:/,$student); + my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname); + next if ($status eq 'nothing' && $submitonly eq 'yes'); - 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) { - $fullname=$name{'lastname'}.$name{'generation'}; - if ($fullname =~ /[^\s]+/) { $fullname.=', '; } - $fullname.=$name{'firstname'}.' '.$name{'middlename'}; - } + my $fullname = &get_fullname($sname,$sdom); 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(''); + $request->print("\n".''. + ''."\n". + ''."\n". + ''."\n". + ''."\n"); + $request->print(''."\n"); + + $request->print(''); } } $request->print('
 Select  Username  Fullname  Domain  Grade Status 
$sname$fullname$sdom'. - ' no '. - ' yes '. - ' last '. - ' all '); - $request->print('
 '.$sname.'  '.$fullname.'  '.$sdom.'  '.$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; + foreach my $student (@stuchecked) { + my ($sname,$sdom,$fullname) = split(/:/,$student); + $ENV{'form.student'} = $sname; + $ENV{'form.fullname'} = $fullname; + &submission($request,$ctr,$total); + $ctr++; + } + + return 'The End'; +} #FIXME - needs to handle multiple matches sub finduser { @@ -186,10 +201,10 @@ sub finduser { if ( $Apache::grades::viewgrades eq 'F' ) { #get classlist - my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); +# 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 ($classlist) = &getclasslist('all','0'); + foreach my $student ( sort(@{ $$classlist{'all'} }) ) { my ($posname,$posdomain) = split(/:/,$student); if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; } } @@ -200,20 +215,27 @@ sub finduser { } sub getclasslist { - my ($coursedomain,$coursenum,$hideexpired) = @_; + my ($getsec,$hideexpired) = @_; + my ($coursedomain,$coursenum) = split(/_/,$ENV{'request.course.id'}); my %classlist=&Apache::lonnet::dump('classlist',$coursedomain,$coursenum); my $now = time; + my (@holdsec,@sections); 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; } - #print "record=$record
"; - push( @{ $classlist{'allids'} }, $student); + my ($unam,$udom) = split(/:/,$student,2); + my $section = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'}); + push @holdsec,$section; + push (@{ $classlist{$getsec} }, $student) if ($getsec eq 'all' or $getsec == $section); + } + my %seen = (); + foreach my $item (@holdsec) { + push (@sections, $item) unless $seen{$item}++; } - return (%classlist); + return (\%classlist,\@sections); } sub getpartlist { @@ -234,60 +256,46 @@ sub viewstudentgrade { my $cellclr = '"#ffffdd"'; my ($username,$domain) = split(/:/,$student); - my (@requests) = ('lastname','firstname','middlename','generation'); - my (%name) = &Apache::lonnet::get('environment',\@requests,$domain,$username); + my $fullname = &get_fullname($username,$domain); 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
'; - $result.='
Username: '.$uname.'Fullname: '.$ENV{'form.fullname'}.'Domain: '.$udom.'
Resource: '.$url.'
'; - if ($ENV{'form.vProb'} eq 'yes') { +# +# 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' && $counter == 0) { 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'}); - $result.='
'; - $result.='
'; - $result.='Student\'s view of the problem:
'.$rendered.'
'; + my $result.='
'; + $result.='
'; + $result.='Student\'s view of the problem
'.$rendered.'
'; $result.='Correct answer:
'.$companswer; $result.='
'; $result.='

'; + $request->print($result); } - my $last = ''; - $last = 'last' if ($ENV{'form.submission'} eq 'last'); +# +# beginning of form + if ($counter == 0) { + $request->print(''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"); + } +# +# Student info + $request->print(($counter == 0 ? '' : '

')); + my $result.=''; + $result.='
Username: '.$uname. + 'Fullname: '. + ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)). + 'Domain: '.$udom.'
Resource: '.$url.'
'; + $request->print($result); +# +# print student answer my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, - $ENV{'request.course.id'},$last); - $result.=$answer.'
Needs an interface for inputting scores'; + $ENV{'request.course.id'},$last); + $request->print($answer); + $answer =~ m/.*<\/tr>.*?		(.*?)(.*?)<\/td>/; + print "Submitted=$1:
$2;"; +# + 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 %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); + my $score = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt); + +# +# display grading options + $result=''. + ''."\n"; + $result.=''; + $result.=''."\n"; + $result.='\n"; + } + } + $result.='
Points'; + my $ctr = 0; + + $result.=''; # display radio buttons in a nice table with 10 across + while ($ctr<=$wgt) { + $result.= '\n"; + $result.=(($ctr+1)%10 == 0 ? '' : ''); + $ctr++; + } + $result.='
'.$ctr."
'; + + $result.='		 or /'.$wgt.' '.$wgtmsg.' '; + + 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 = 'partial' if ($foo =~ /partially/); + $status = 'nothing' if ($status eq ''); + $result.='
'; + $request->print($result); +# +# 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 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 $vProb = $ENV{'form.vProb'}; +# my $lastSub= $ENV{'form.lastSub'}; my (@parts) = sort(&getpartlist($url)); - #start the form - $result.= '
'."\n". - ''."\n". - ''."\n". - ''."\n". - '
'."\n". - ''."\n". - ''; - #get info for each student - $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$uname,@parts); + #get classlist +# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); + my ($classlist) = &getclasslist('all','0'); - $result.='
'."\n"; + 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,$ctr,@parts); +# &saveHandGrade($url,$symb,$uname,$udom,$score,@parts); + $ctr++; + } + } + my $firststu = $ENV{'form.unamedom0'}; + my $laststu = $ENV{'form.unamedom'.($ngrade-1)}; - $result.='
'; - return $result; + my (@nextlist,@prevlist); + my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0); + foreach my $student ( sort(@{ $$classlist{'all'} }) ) { + my ($uname,$udom) = split(/:/,$student); + if ($nextflg == 1 && $button =~ /Next$/) { + push @nextlist,$uname if ($ctr < $ntstu); + $ctr++; + } + $nextflg = 1 if ($student eq $laststu); + $prevflg = 1 if ($student eq $firststu); + if ($prevflg == 0 && $button eq 'Previous') { + push @prevlist,$uname; + $ctprev++; + } + } + if ($button eq 'Previous') { + if ($ctprev <= $ntstu) { + @nextlist = @prevlist; + } else { + my $idx = 0; + my $start = $ctprev - $ntstu; + while ($idx < $ntstu) { + $nextlist[$idx] = $prevlist[$start+$idx]; + $idx++; + } + } + } + $ctr = 0; + my $total = scalar(@nextlist)-1; + foreach my $student (@nextlist) { + $ENV{'form.student'} = $student; + &submission($request,$ctr,$total); + $ctr++; + } + + return 'The End'; } -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 saveHandGrade { + my ($url,$symb,$stuname,$domain,$newflg,@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; + if ($type eq 'awarded' && $newflg >= 0) { + my $pts = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ? $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg}); + my $wgt = $ENV{'form.WGT'.$newflg}; +# my $sel = $ENV{'form.GRADE_SEL'.$newflg}; + $newscore = $pts/$wgt if ($wgt != 0); + } + if ($type eq 'solved') { + $newscore = $ENV{'form.GRADE_SEL'.$newflg} if ($newflg >= 0); + 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 'partial') { $newscore = 'correct_partially_by_override'; } + } + 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'}"; + while (my ($k,$v) = each %newrecord) { + print "k=$k:v=$v:
\n"; + } + print "symb=$symb,courseid=$ENV{'request.course.id'},dom=$domain,name=$stuname
"; +# &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname); + } + return ''; } -sub view_edit_entire_class_form { - my ($symb,$url)=@_; - my $result.='
'."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
'."\n"; - return $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 { @@ -417,30 +666,107 @@ sub gradingmenu { my ($symb,$url)=&get_symb_and_url($request); if (!$symb) {return '';} - my $result='

 Select a Grading Method


'; - $result.='
'."\n"; - $result.=''."\n"; + my $result='

 Select a Grading Method

'; + $result.=' Resource: '.$url.'

'; + + $result.=&view_edit_entire_class_form($symb,$url).'
'; + $result.=&upcsvScores_form($symb,$url).'
'; + $result.=&viewGradeaStu_form($symb,$url).'
'; + $result.=&verifyReceipt_form($symb,$url); + return $result; +} + +sub view_edit_entire_class_form { + my ($symb,$url)=@_; + my $result.='
'."\n"; - $result.=' Resource : '.$url.'
'."\n"; + $result.=''."\n"; $result.='
'."\n"; + $result.=' View/Grade Entire Class
'."\n"; - $result.=&view_edit_entire_class_form($symb,$url); $result.='
'."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
'."\n"; - $result.='
'."\n". - ''."\n". + ''."\n". ''."\n". - ''."\n". - ''."\n". - '
'."\n"; + ''."\n"; + $result.=' Display students who has: '. + ' submitted'. + ' everybody

'; + $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.=< + + + +$upfile_select +
  + +ENDUPFORM + $result.='
'."\n"; + $result.='
'."\n"; + return $result; +} + +sub viewGradeaStu_form { + my ($symb,$url) = @_; + 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 -1 implies the students were not assigned a section.)
' if (grep /-1/,@$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; @@ -456,7 +782,7 @@ sub viewgrades { #get classlist my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); #print "Found $cdom:$cnum
"; - my (%classlist) = &getclasslist($cdom,$cnum,'0'); + my ($classlist) = &getclasslist('all','0'); my $headerclr = '"#ccffff"'; my $cellclr = '"#ffffcc"'; @@ -471,7 +797,7 @@ sub viewgrades { ''."\n". ''."\n". ''."\n". - '
'."\n". + '
'."\n". ''."\n". ''."\n"; foreach my $part (@parts) { @@ -481,10 +807,13 @@ sub viewgrades { } $result.=''; #get info for each student - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { + foreach my $student ( sort(@{ $$classlist{'all'} }) ) { + 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
'; + $result.='
'; + $result.=''; $result.=&show_grading_menu_form($symb,$url); return $result; } @@ -497,9 +826,9 @@ sub editgrades { 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'}); +# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); #print "Found $cdom:$cnum
"; - my (%classlist) = &getclasslist($cdom,$cnum,'0'); + my ($classlist) = &getclasslist('all','0'); #get list of parts for this problem my (@parts) = &getpartlist($url); @@ -510,7 +839,7 @@ sub editgrades { ''."\n". '
'."\n"; - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { + foreach my $student ( sort(@{ $$classlist{'all '} }) ) { $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts); } @@ -518,25 +847,6 @@ sub editgrades { 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(); - $result.=< - - - -
-

Specify a file containing the class grades for resource $url

-$upfile_select -

-ENDUPFORM - return $result; -} - sub csvupload_javascript_reverse_associate { return(<print('

Assigning Grades

'); my $courseid=$ENV{'request.course.id'}; - my $cdom=$ENV{"course.$courseid.domain"}; - my $cnum=$ENV{"course.$courseid.num"}; - my (%classlist) = &getclasslist($cdom,$cnum,'1'); +# 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); my $username=$entries{$fields{'username'}}; my $domain=$entries{$fields{'domain'}}; - if (!exists($classlist{"$username:$domain"})) { + if (!exists($$classlist{"$username:$domain"})) { push(@skipped,"$username:$domain"); next; } @@ -837,11 +1147,15 @@ sub handler { $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 ''); + &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') { @@ -850,8 +1164,8 @@ sub handler { $request->print(&csvupload($request)); } elsif ($command eq 'csvuploadmap') { $request->print(&csvuploadmap($request)); - } elsif ($command eq 'receiptInput') { - &receiptInput($request); +# } elsif ($command eq 'receiptInput') { +# &receiptInput($request); } elsif ($command eq 'csvuploadassign') { if ($ENV{'form.associate'} ne 'Reverse Association') { $request->print(&csvuploadassign($request));