--- loncom/homework/grades.pm 2002/06/26 21:25:31 1.32 +++ loncom/homework/grades.pm 2002/07/07 20:08:45 1.36 @@ -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.36 2002/07/07 20:08:45 ng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,7 +30,7 @@ # 7/26 H.K. Ng # 8/20 Gerd Kortemeyer # Year 2002 -# June 2002 H.K. Ng +# June, July 2002 H.K. Ng # package Apache::grades; @@ -53,6 +53,7 @@ sub moreinfo { if ($ENV{'form.symb'}) { $request->print(''."\n"); } +# $request->print(''."\n"); $request->print(''."\n"); $request->print("Student:".''."
\n"); $request->print("Domain:".''."
\n"); @@ -65,8 +66,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 +78,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,35 +88,11 @@ 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))); @@ -124,6 +101,7 @@ sub student_gradeStatus { 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; } @@ -131,85 +109,114 @@ sub student_gradeStatus { 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 - +

 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 ProblemSubmissionsGrade StatusAction
+ + + 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(''); - my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname); - $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 '.$status.' '); - $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; + if ($stuchecked[0] eq '') { + &userError($request,'No student was selected for viewing/grading.'); + return; + } + foreach (@stuchecked) { + my ($sname,$sdom,$fullname) = split(/:/); + $ENV{'form.student'} = $sname; + $ENV{'form.fullname'} = $fullname; + &submission($request,$ctr,$total); + $ctr++; + } + return 'The End'; +} + +sub userError { + my ($request, $reason, $step) = @_; + $request->print('

LON-CAPA User Error


'."\n"); + $request->print('Reason: '.$reason.'

'."\n"); + $request->print('Step: '.($step ne '' ? $step : 'Use your browser back button to correct') + .'

'."\n"); + return ''; +} #FIXME - needs to handle multiple matches sub finduser { my ($name) = @_; my $domain = ''; - if ( $Apache::grades::viewgrades eq 'F' ) { - #get classlist - 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 ($posname,$posdomain) = split(/:/,$student); + my ($classlist) = &getclasslist('all','0'); + foreach ( sort(@{ $$classlist{'all'} }) ) { + my ($posname,$posdomain) = split(/:/); if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; } } return ($name,$domain); @@ -219,20 +226,28 @@ 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'}); + $section = ($section ne '-1' ? $section : 'no'); + push @holdsec,$section; + push (@{ $classlist{$getsec} }, $student) if ($getsec eq 'all' || $getsec eq $section); + } + my %seen = (); + foreach my $item (@holdsec) { + push (@sections, $item) unless $seen{$item}++; } - return (%classlist); + return (\%classlist,\@sections); } sub getpartlist { @@ -253,14 +268,9 @@ 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\n"; foreach my $part (@parts) { my ($temp,$part,$type)=split(/_/,$part); @@ -272,7 +282,7 @@ sub viewstudentgrade { my ($status,$foo)=split(/_/,$score,2); $result.="'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"); + + if ($ENV{'form.handgrade'} eq 'yes') { + $request->print(<Keyword Options  +Keyword List    +Paste Selection to Keyword list (requires N4+ and IE5+)    +Keyword Highlight Attribute

+KEYWORDS + } } - 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"; +# +# Student info + $request->print(($counter == 0 ? '' : '

')); + my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)); + my $result.=''; + if ($ENV{'form.handgrade'} eq 'yes') { + my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'}); + my ($classlist) = &getclasslist('all','0'); + my @collaborators; + foreach ( sort(@{ $$classlist{'all'} }) ) { + my ($sname,$sdom) = split(/:/); + push @collaborators,$sname if (grep /\b$sname(\b|\.)/i,$subonly); + } + push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators. + if (scalar(@collaborators) != 0) { + $result.=''."\n"; + $result.=''."\n"; + } + } + $result.='
Username: '.$uname. + 'Fullname: '.$fullname. +# ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)). + 'Domain: '.$udom.'
Collaborators: '; + foreach (@collaborators) { + $result.=$_.' ('.&get_fullname($_,$udom).')    '; + } + $result.='
'."\n"; + $request->print($result); +# +# print student answer + $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, + $ENV{'request.course.id'},$last, + '.submission','Apache::grades::keywords_highlight')); +# +# + 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.=''."\n". + $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.='
Points'; my $ctr = 0; + + $result.=''; # display radio buttons in a nice table with 10 across while ($ctr<=$wgt) { - $result.= ' '.$ctr."\n"; + $result.= '\n"; + $result.=(($ctr+1)%10 == 0 ? '' : ''); $ctr++; } + $result.='
'.$ctr."
'; + $result.='		 or /'.$wgt.' (problem weight)
/'.$wgt.' '.$wgtmsg.' '; - $result.=''."\n"; - $result.='
 '; - $result.=' '; - $result.=' '; - $result.='
'; - return $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); + $status = 'partial' if ($foo =~ /partially/); + $status = 'nothing' if ($status eq ''); + $result.='  \n"; + $result.='Compose Message'."\n"; + } + } + $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 get_last_submission { + my ($symb,$username,$domain,$course)=@_; + if ($symb) { + my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username); + if ($returnhash{'version'}) { + my %lasthash=(); + my $version; + for ($version=1;$version<=$returnhash{'version'};$version++) { + foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) { + $lasthash{$_}=$returnhash{$version.':'.$_}; + } + } + foreach ((keys %lasthash)) { + if ($_ =~ /\.submission$/) {return $lasthash{$_}} + } + return ''; + } + } +} + +sub keywords_highlight { + my $string = shift; + (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))); + my %keyhash = &Apache::lonnet::get + ('nohist_handgrade',[$symb.'_keywords'], + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my @keylist = split(/[,\s+]/,$keyhash{$symb.'_keywords'}); + foreach my $word (@keylist) { + next if ($word eq ''); + $string =~ s/\b$word(\b|\.)/\$word\<\/font\>/gi; + } + return $string; } sub processHandGrade { - my ($url,$symb,$courseid,$student,@parts) = @_; + 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 $keywords= $ENV{'form.keywords'}; + my $newmsg0 = $ENV{'form.newmsg0'}; + print "newmsg0=$newmsg0
"; + my $newmsg1 = $ENV{'form.newmsg1'}; + print "newmsg1=$newmsg1
"; + my $oldmsg1 = $ENV{'form.savemsg1'}; + print "oldmsg1=$oldmsg1
"; + my $oldmsg2 = $ENV{'form.savemsg2'}; + print "oldmsg1=$oldmsg2
"; + my $oldmsg3 = $ENV{'form.savemsg3'}; + print "oldmsg1=$oldmsg3
"; + my $oldmsg4 = $ENV{'form.savemsg4'}; + print "oldmsg1=$oldmsg4
"; + my $messages = $ENV{'form.includemsg0'}; + print "messages=$messages
"; + if ($keywords ne '') { + my $crsname = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; + my $crsdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; +# my $putresult = &Apache::lonnet::put +# ('nohist_handgrade',{$symb.'_keywords' => $keywords}, +# $crsdom,$crsname); + } + my (@parts) = sort(&getpartlist($url)); - my ($stuname,$domain) = split(/:/,$student); - my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname); + if ($button eq 'Save & Next') { + my $ctr = 0; + while ($ctr < $ENV{'form.NCT'}) { + my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr}); + &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts); + if ($ENV{'form.collaborator'.$ctr}) { + my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr}); + foreach (@collaborators) { + &saveHandGrade($url,$symb,$_,$udom,$ctr,@parts); + } + } + $ctr++; + } + } + my $firststu = $ENV{'form.unamedom0'}; + my $laststu = $ENV{'form.unamedom'.($ngrade-1)}; + + my ($classlist) = &getclasslist($ENV{'form.section'},'0'); + + my (@nextlist,@prevlist); + my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0); + foreach my $student ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) { + 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 saveHandGrade { + my ($url,$symb,$stuname,$domain,$newflg,@parts) = @_; + 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'}); + 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 '') { @@ -463,45 +950,32 @@ 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 = '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'}"; - 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); + $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 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 ($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 view_edit_entire_class_form { - my ($symb,$url)=@_; - my $result.='
'."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
'."\n"; - return $result; + return ($symb,$url); } sub show_grading_menu_form { @@ -519,31 +993,119 @@ sub gradingmenu { my ($request) = @_; my ($symb,$url)=&get_symb_and_url($request); if (!$symb) {return '';} + my $allkeys = &Apache::lonnet::metadata($url,'keys'); + my $handgrade = ($allkeys =~ /parameter_.*?_handgrade/ ? 'yes' : 'no'); + my ($responsetype,$foo) = split(/_/,&Apache::lonnet::metadata($url,'packages')); + + my $result='

 Select a Grading Method

'; + $result.=''; + $result.=''. + ''; + $result.=''. + ''; + $result.='
Resource: '.$url.'
Type: '.$responsetype.'  Handgrade: '.$handgrade.'
'; + + $result.=&view_edit_entire_class_form($symb,$url).'
'; + $result.=&upcsvScores_form($symb,$url).'
'; + $result.=&viewGradeaStu_form($symb,$url,$responsetype,$handgrade).'
'; + $result.=&verifyReceipt_form($symb,$url); + return $result; +} - my $result='

 Select a Grading Method


'; - $result.=''."\n"; } $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); @@ -604,9 +1165,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); @@ -617,7 +1178,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); } @@ -625,25 +1186,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; } @@ -944,11 +1486,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') { @@ -957,8 +1503,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));
'."\n"; - $result.=''."\n"; +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,$response,$handgrade) = @_; + 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". + ''."\n". + ''."\n"; + + $result.=' Select section: '."\n"; + $result.='  Display students who has: '. + ' submitted'. + ' everybody
'; + $result.=' (Section "no" implies the students were not assigned a section.)
' + if (grep /no/,@$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; @@ -559,7 +1121,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"'; @@ -580,12 +1142,11 @@ 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.'