-
- View Problem: no - yes - Submissions: last - all - - - - -
-
|
LON-CAPA User Error
'."\n"); - $request->print('Reason: '.$reason.'
'."\n"); - $request->print('Step: '.($step ne '' ? $step : 'Use your browser back button to correct') - .'
'."\n"); +#--- Prompts a user to enter a username. +sub moreinfo { + my ($request,$reason) = @_; + $request->print("Unable to process request: $reason"); + if ( $Apache::grades::viewgrades eq 'F' ) { + $request->print(''); + } return ''; } -#FIXME - needs to handle multiple matches -sub finduser { - my ($name) = @_; - my $domain = ''; - if ( $Apache::grades::viewgrades eq 'F' ) { - my ($classlist) = &getclasslist('all','0'); - foreach ( sort(@{ $$classlist{'all'} }) ) { - my ($posname,$posdomain) = split(/:/); - if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; } - } - return ($name,$domain); - } else { - return ($ENV{'user.name'},$ENV{'user.domain'}); - } +#--- Retrieve the grade status of a student for all the parts +sub student_gradeStatus { + my ($url,$symb,$udom,$uname,$partlist) = @_; + my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); + my %partstatus = (); + foreach (@$partlist) { + my ($status,$foo) = split(/_/,$record{"resource.$_.solved"},2); + $status = 'nothing' if ($status eq ''); + $partstatus{$_} = $status; + my $subkey = "resource.$_.submitted_by"; + $partstatus{$subkey} = $record{$subkey} if ($record{$subkey} ne ''); + } + return %partstatus; +} + +# hidden form and javascript that calls the form +# Use by verifyscript and viewgrades +# Shows a student's view of problem and submission +sub jscriptNform { + my ($url,$symb) = @_; + my $jscript=''."\n"; + $jscript.= ''."\n"; + return $jscript; } -sub getclasslist { - 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)) { - next; - } - 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,\@sections); -} +#------------------ End of general use routines -------------------- +#------------------------------------------------------------------- -sub getpartlist { - my ($url) = @_; - my @parts =(); - my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys')); - foreach my $key (@metakeys) { - if ( $key =~ m/stores_([0-9]+)_.*/) { - push(@parts,$key); +#------------------------------------ Receipt Verification Routines +# +#--- Check whether a receipt number is valid.--- +sub verifyreceipt { + my $request = shift; + + my $courseid = $ENV{'request.course.id'}; + my $receipt = unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'. + $ENV{'form.receipt'}; + $receipt =~ s/[^\-\d]//g; + my $url = $ENV{'form.url'}; + my $symb = $ENV{'form.symb'}; + unless ($symb) { + $symb = &Apache::lonnet::symbread($url); } - } - return @parts; -} -sub viewstudentgrade { - my ($url,$symb,$courseid,$student,@parts) = @_; - my $result =''; - my $cellclr = '"#ffffdd"'; - my ($username,$domain) = split(/:/,$student); - - my $fullname = &get_fullname($username,$domain); - my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username); - - $result.="
Verifying Submission Receipt '. + $receipt.'
'."\n". + 'Problem: '.$ENV{'form.probTitle'}.''."\n"; + + my ($string,$contents,$matches) = ('','',0); + my (undef,undef,$fullname) = &getclasslist('all','0'); + + foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) { + my ($uname,$udom)=split(/\:/); + if ($receipt eq + &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) { + $contents.='
'."\n".
+ '
|
"; - 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' ) { - if ($oldscore ne '') { - $update=1; - $newscore = ''; - } - } elsif ($oldscore !~ m/^$newscore/) { - $update=1; - $result.="Updating $stuname to $newscore
\n"; - 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'; } - } else { - #$result.="$stuname:$part:$type:unchanged $oldscore to $newscore:
\n"; - } - if ($update) { $newrecord{"resource.$part.$type"}=$newscore; } + my ($symb,$url) = &get_symb_and_url($request); + my $cdom = $ENV{"course.$ENV{'request.course.id'}.domain"}; + my $cnum = $ENV{"course.$ENV{'request.course.id'}.num"}; + my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'}; + my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'}; + + my $result; + my ($partlist,$handgrade) = &response_type($url); + for (sort keys(%$handgrade)) { + my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_}); + $ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes'); + $result.='
'. + $viewgrade. + ' Submissions for a Student or a Group of Students
'. + '| '. + 'Problem: '.$ENV{'form.probTitle'}.' | ||
';
- $result.='
|
'; - $request->print($result); - } -# -# beginning of form - if ($counter == 0) { - my %keyhash = &Apache::lonnet::get - ('nohist_handgrade',[$symb.'_keywords'], - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - - $request->print(''; - $request->print($endform); - } - return ''; + $result.=" \n"; + $result.=''."\n". + ''."\n". + ''."\n"; + $result.='
';
+ $result.='
|
'; + return $result; } +# --------------------------- show submissions of a student, option to grade +sub submission { + my ($request,$counter,$total) = @_; + + (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; + my ($uname,$udom) = ($ENV{'form.student'},$ENV{'form.userdom'}); + ($uname,$udom) = &finduser($uname) if $udom eq ''; + $ENV{'form.fullname'} = &get_fullname ($uname,$udom) if $ENV{'form.fullname'} eq ''; + + 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) { + &sub_page_js($request); + &sub_page_kw_js($request); + $ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ? + &Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'}; + + $request->print('
Submission Record
'."\n". + ' Problem: '.$ENV{'form.probTitle'}.''."\n"); + + # 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' or !$ENV{'form.vProb'}) { + $request->print(&show_problem($request,$symb,$uname,$udom,0,1)); + } + + # kwclr is the only variable that is guaranteed to be non blank + # if this subroutine has been called once. + my %keyhash = (); + if ($ENV{'form.kwclr'} eq '') { + %keyhash = &Apache::lonnet::dump('nohist_handgrade', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + + my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'}; + $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : ''; + $ENV{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red'; + $ENV{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0'; + $ENV{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : ''; + $ENV{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ? + $keyhash{$symb.'_subject'} : $ENV{'form.probTitle'}; + $ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0'; + + } + + $request->print(''."\n"); + $request->print(&show_grading_menu_form($symb,$url)) + if (($ENV{'form.command'} eq 'submission') || + ($ENV{'form.command'} eq 'processGroup' && $counter == $total)); + return; + } + + # Grading options + $result=''."\n". + ''."\n". + ''."\n"; + my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'}); + my $msgfor = $givenn.' '.$lastname; + if (scalar(@col_fullnames) > 0) { + my $lastone = pop @col_fullnames; + $msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.'; + } + $result.='.
+ '/mailbkgrd.gif){kind=small}
'."\n".
+ '(Message will be sent when you click on Save & Next below.)'."\n" + if ($ENV{'form.handgrade'} eq 'yes'); + $request->print($result); + + my %seen = (); + my @partlist; + for (sort keys(%$handgrade)) { + my ($partid,$respid) = split(/_/); + next if ($seen{$partid} > 0); + $seen{$partid}++; + next if ($$handgrade{$_} =~ /:no$/); + push @partlist,$partid; + + $request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); + } + $result=''."\n"; + my $ctr = 0; + while ($ctr < scalar(@partlist)) { + $result.=''."\n"; + $ctr++; + } + $request->print($result.'
| '. + ''."\n"; + if ($ENV{'form.handgrade'} eq 'yes') { + $endform.=' '."\n"; + my $ntstu =''."\n"; + my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1'); + $ntstu =~ s/ |
to make things formatted a little better. + $string =~ s:^:
:mg; + return $string; } +#--- Called from submission routine 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 $keywords= $ENV{'form.keywords'}; - my $addmsg = $ENV{'form.addmsg'}; - print "addmsg=$addmsg
"; - 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 ($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'}; + + if ($button eq 'Save & Next') { + my $ctr = 0; + while ($ctr < $ngrade) { + my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr}); + my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr); + if ($errorflag eq 'no_score') { + $ctr++; + next; + } + my $includemsg = $ENV{'form.includemsg'.$ctr}; + my ($subject,$message,$msgstatus) = ('','',''); + if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) { + $subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/); + my (@msgnum) = split(/,/,$includemsg); + foreach (@msgnum) { + $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne ''); + } + $message =&Apache::lonfeedback::clear_out_html($message); + $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt; + $message.=" for $ENV{'form.probTitle'}"; + $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom, + $ENV{'form.msgsub'},$message); + } + if ($ENV{'form.collaborator'.$ctr}) { + my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr}); + foreach (@collaborators) { + &saveHandGrade($request,$url,$symb,$_,$udom,$ctr, + $ENV{'form.unamedom'.$ctr}); + if ($message ne '') { + $msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom, + $ENV{'form.msgsub'}, + $message); + } + } + } + $ctr++; + } + } - 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)}; + # Keywords sorted in alphabatical order + my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'}; + my %keyhash = (); + $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g; + $ENV{'form.keywords'} =~ s/^\s+|\s+$//; + my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'})); + $ENV{'form.keywords'} = join(' ',@keywords); + $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'}; + $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'}; + $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'}; + $keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'}; + $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'}; + + # message center - Order of message gets changed. Blank line is eliminated. + # New messages are saved in ENV for the next student. + # All messages are saved in nohist_handgrade.db + my ($ctr,$idx) = (1,1); + while ($ctr <= $ENV{'form.savemsgN'}) { + if ($ENV{'form.savemsg'.$ctr} ne '') { + $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr}; + $idx++; + } + $ctr++; + } + $ctr = 0; + while ($ctr < $ngrade) { + if ($ENV{'form.newmsg'.$ctr} ne '') { + $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr}; + $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr}; + $idx++; + } + $ctr++; + } + $ENV{'form.savemsgN'} = --$idx; + $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'}; + my $putresult = &Apache::lonnet::put + ('nohist_handgrade',\%keyhash, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + + # Called by Save & Refresh from Highlight Attribute Window + if ($ENV{'form.refresh'} eq 'on') { + my $ctr = 0; + $ENV{'form.NTSTU'}=$ngrade; + while ($ctr < $ngrade) { + ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$ENV{'form.unamedom'.$ctr}); + &submission($request,$ctr,$ngrade-1); + $ctr++; + } + return ''; + } - my ($classlist) = &getclasslist($ENV{'form.section'},'0'); + # Get the next/previous one or group of students + my $firststu = $ENV{'form.unamedom0'}; + my $laststu = $ENV{'form.unamedom'.($ngrade-1)}; + $ctr = 2; + while ($laststu eq '') { + $laststu = $ENV{'form.unamedom'.($ngrade-$ctr)}; + $ctr++; + $laststu = $firststu if ($ctr > $ngrade); + } + + my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'0'); + my (@parsedlist,@nextlist); + my ($nextflg) = 0; + foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) { + if ($nextflg == 1 && $button =~ /Next$/) { + push @parsedlist,$_; + } + $nextflg = 1 if ($_ eq $laststu); + if ($button eq 'Previous') { + last if ($_ eq $firststu); + push @parsedlist,$_; + } + } + $ctr = 0; + my ($partlist,$handgrade) = &response_type($ENV{'form.url'}); + @parsedlist = reverse @parsedlist if ($button eq 'Previous'); + foreach my $student (@parsedlist) { + my ($uname,$udom) = split(/:/,$student); + if ($ENV{'form.submitonly'} eq 'yes') { + my (%status) = &student_gradeStatus($ENV{'form.url'},$symb,$udom,$uname,$partlist) ; + my $statusflg = ''; + foreach (keys(%status)) { + $statusflg = 1 if ($status{$_} ne 'nothing'); + my ($foo,$partid,$foo1) = split(/\./); + $statusflg = '' if ($status{'resource.'.$partid.'.submitted_by'} ne ''); + } + next if ($statusflg eq ''); + } + push @nextlist,$student if ($ctr < $ntstu); + $ctr++; + } - 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++; - } + $ctr = 0; + my $total = scalar(@nextlist)-1; - return 'The End'; + foreach (sort @nextlist) { + my ($uname,$udom,$submitter) = split(/:/); + $ENV{'form.student'} = $uname; + $ENV{'form.userdom'} = $udom; + $ENV{'form.fullname'} = $$fullname{$_}; + &submission($request,$ctr,$total); + $ctr++; + } + if ($total < 0) { + my $the_end = '
LON-CAPA User Message
'."\n"; + $the_end.='Message: No more students for this section or class.
'."\n"; + $the_end.='Click on the button below to return to the grading menu.
'."\n"; + $the_end.=&show_grading_menu_form ($symb,$url); + $request->print($the_end); + } + return ''; } +#---- Save the score and award for each student, if changed 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; - 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; - } + my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter) = @_; + my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname); + my %newrecord = (); + my ($pts,$wgt) = ('',''); + foreach (split(/:/,$ENV{'form.partlist'.$newflg})) { + if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq 'excused') { + if ($record{'resource.'.$_.'.solved'} ne 'excused') { + $newrecord{'resource.'.$_.'.solved'} = 'excused'; + if (exists($record{'resource.'.$_.'.awarded'})) { + $newrecord{'resource.'.$_.'.awarded'} = ''; + } + } + } else { + $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ? + $ENV{'form.GD_BOX'.$newflg.'_'.$_} : + $ENV{'form.RADVAL'.$newflg.'_'.$_}); + return 'no_score' if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq ''); + $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 : + $ENV{'form.WGT'.$newflg.'_'.$_}; + my $partial= $pts/$wgt; + $newrecord{'resource.'.$_.'.awarded'} = $partial + if ($record{'resource.'.$_.'.awarded'} ne $partial); + my $reckey = 'resource.'.$_.'.solved'; + if ($partial == 0) { + $newrecord{$reckey} = 'incorrect_by_override' + if ($record{$reckey} ne 'incorrect_by_override'); + } else { + $newrecord{$reckey} = 'correct_by_override' + if ($record{$reckey} ne 'correct_by_override'); + } + $newrecord{'resource.'.$_.'.submitted_by'} = $submitter + if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter)); + $newrecord{'resource.'.$_.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; + } } - } - 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 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); + if (scalar(keys(%newrecord)) > 0) { + &Apache::lonnet::cstore(\%newrecord,$symb, + $ENV{'request.course.id'},$domain,$stuname); + } + return '',$pts,$wgt; } -sub show_grading_menu_form { - my ($symb,$url)=@_; - my $result.=''."\n"; - return $result; -} +#-------------------------------------------------------------------------------------- +# +#-------------------------- Next few routines handles grading by section or whole class +# +#--- Javascript to handle grading by section or whole class +sub viewgrades_js { + my ($request) = shift; -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.='| Resource: | '. - ''.$url.' |
| Type: | '. - ''.$responsetype.' Handgrade: '.$handgrade.' |
'; - $result.=&upcsvScores_form($symb,$url).'
'; - $result.=&viewGradeaStu_form($symb,$url,$responsetype,$handgrade).'
'; - $result.=&verifyReceipt_form($symb,$url); - return $result; -} - -sub view_edit_entire_class_form { - my ($symb,$url)=@_; - my $result.='
'."\n";
- $result.='
|
'."\n";
- $result.='
|
'."\n";
- $result.='
|
'."\n";
- $result.='
|
Manual Grading
'; - #get resource reference - my ($symb,$url)=&get_symb_and_url($request); - if (!$symb) {return '';} - #get classlist - my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); - #print "Found $cdom:$cnum"; - my ($classlist) = &getclasslist('all','0'); - my $headerclr = '"#ccffff"'; - my $cellclr = '"#ffffcc"'; - - #get list of parts for this problem - my (@parts) = sort(&getpartlist($url)); - - $request->print ("
Manual Grading
"); - - #start the form - $result = ''; - $result.=&show_grading_menu_form($symb,$url); - return $result; + ''."\n". + ''."\n". + ''."\n"; + + $result.='Assign Common Grade To '; + if ($ENV{'form.section'} eq 'all') { + $result.='Class
'; + } elsif ($ENV{'form.section'} eq 'no') { + $result.='Students in no Section '; + } else { + $result.='Students in Section '.$ENV{'form.section'}.''; + } + $result.= ''."\n".
+ '
|
Assign Grade to Specific Students in '; + if ($ENV{'form.section'} eq 'all') { + $result.='the Class
'; + } elsif ($ENV{'form.section'} eq 'no') { + $result.='no Section '; + } else { + $result.='Section '.$ENV{'form.section'}.''; + } + $result.= ''."\n".
+ '
|
"; - my ($classlist) = &getclasslist('all','0'); - - #get list of parts for this problem - my (@parts) = &getpartlist($url); - - $result.=''; - return $result; -} +#---------------------------------------------------------------------------- +# +#-------------------------- Next few routines handles grading by csv upload +# +#--- Javascript to handle csv upload sub csvupload_javascript_reverse_associate { return(<
Uploading Class Grades for resource $url
+Uploading Class Grades
+$resultIdentify fields
Total number of records found in file: $distotal@@ -1073,34 +2176,36 @@ to this page if the data selected is ins value="$ENV{'form.upfile_associate'}" /> + +
ENDPICK - return ''; +return ''; } sub csvupload_fields { - my ($url) = @_; - my (@parts) = &getpartlist($url); - my @fields=(['username','Student Username'],['domain','Student Domain']); - foreach my $part (sort(@parts)) { - my @datum; - my $display=&Apache::lonnet::metadata($url,$part.'.display'); - my $name=$part; - if (!$display) { $display = $name; } - @datum=($name,$display); - push(@fields,\@datum); - } - return (@fields); + my ($url) = @_; + my (@parts) = &getpartlist($url); + my @fields=(['username','Student Username'],['domain','Student Domain']); + foreach my $part (sort(@parts)) { + my @datum; + my $display=&Apache::lonnet::metadata($url,$part.'.display'); + my $name=$part; + if (!$display) { $display = $name; } + @datum=($name,$display); + push(@fields,\@datum); + } + return (@fields); } sub csvuploadmap_footer { - my ($request,$i,$keyfields) =@_; - $request->print(<
Assigning Grades
'); + my $courseid=$ENV{'request.course.id'}; + 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"})) { + push(@skipped,"$username:$domain"); + next; + } + my %grades; + foreach my $dest (keys(%fields)) { + if ($dest eq 'username' || $dest eq 'domain') { next; } + if ($entries{$fields{$dest}} eq '') { next; } + my $store_key=$dest; + $store_key=~s/^stores/resource/; + $store_key=~s/_/\./g; + $grades{$store_key}=$entries{$fields{$dest}}; + } + $grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}"; + &Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'}, + $domain,$username); + $request->print('.'); + $request->rflush(); + $countdone++; + } + $request->print("Stored $countdone students\n"); + if (@skipped) { + $request->print('
Skipped Students
'); + foreach my $student (@skipped) { $request->print("
$student"); } + } + $request->print(&view_edit_entire_class_form($symb,$url)); + $request->print(&show_grading_menu_form($symb,$url)); + return ''; +} +#------------- end of section for handling csv file upload --------- +# +#------------------------------------------------------------------- +# +#-------------- Next few routines handles grading by page/sequence +# +#--- Select a page/sequence and a student to grade +sub pickStudentPage { + my ($request) = shift; + + $request->print(<
Assigning Grades
'); - my $courseid=$ENV{'request.course.id'}; -# 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"})) { - push(@skipped,"$username:$domain"); - next; - } - my %grades; - foreach my $dest (keys(%fields)) { - if ($dest eq 'username' || $dest eq 'domain') { next; } - if ($entries{$fields{$dest}} eq '') { next; } - my $store_key=$dest; - $store_key=~s/^stores/resource/; - $store_key=~s/_/\./g; - $grades{$store_key}=$entries{$fields{$dest}}; - } - $grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}"; - &Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'}, - $domain,$username); - $request->print('.'); - $request->rflush(); - $countdone++; - } - $request->print("Stored $countdone students\n"); - if (@skipped) { - $request->print('
Skipped Students
'); - foreach my $student (@skipped) { $request->print("
$student"); } - } - $request->print(&view_edit_entire_class_form($symb,$url)); - $request->print(&show_grading_menu_form($symb,$url)); - return ''; } + +LISTJAVASCRIPT -sub send_header { - my ($request)= @_; - $request->print(&Apache::lontexconvert::header()); -# $request->print(" -#"); - $request->print(''); + my ($symb,$url) = &get_symb_and_url($request); + my $cdom = $ENV{"course.$ENV{'request.course.id'}.domain"}; + my $cnum = $ENV{"course.$ENV{'request.course.id'}.num"}; + my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'}; + + my $result='