--- loncom/homework/grades.pm 2003/03/11 19:32:02 1.71 +++ loncom/homework/grades.pm 2003/03/24 21:03:54 1.76 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.71 2003/03/11 19:32:02 ng Exp $ +# $Id: grades.pm,v 1.76 2003/03/24 21:03:54 ng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -113,7 +113,7 @@ sub response_type { #--- Dumps the class list with usernames,list of sections, #--- section, ids and fullnames for each user. sub getclasslist { - my ($getsec,$hideexpired) = @_; + my ($getsec,$filterlist) = @_; my $classlist=&Apache::loncoursedata::get_classlist(); # Bail out if we were unable to get the classlist return if (! defined($classlist)); @@ -124,11 +124,13 @@ sub getclasslist { # the following undefs are for 'domain', and 'username' respectively. my (undef,undef,$end,$start,$id,$section,$fullname,$status)= @{$classlist->{$_}}; - # still a student? - if (($hideexpired) && ($status ne 'Active')) { - delete ($classlist->{$_}); - next; - } + # filter students according to status selected + if ($filterlist && $ENV{'form.saveStatus'} ne 'Any') { + if ($ENV{'form.saveStatus'} ne $status) { + delete ($classlist->{$_}); + next; + } + } $section = ($section ne '' ? $section : 'no'); if ($getsec eq 'all' || $getsec eq $section) { $sections{$section}++; @@ -209,6 +211,11 @@ sub jscriptNform { $jscript.= '
'."\n". ''."\n". ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". ''."\n". ''."\n". ''."\n". @@ -237,8 +244,7 @@ sub verifyreceipt { my $title.='

Verifying Submission Receipt '. $receipt.'

'."\n". - 'Problem: '. - &Apache::lonnet::metadata($ENV{'form.url'},'title').'

'."\n"; + 'Problem: '.$ENV{'form.probTitle'}.'

'."\n"; my ($string,$contents,$matches) = ('','',0); my (undef,undef,$fullname) = &getclasslist('all','0'); @@ -273,10 +279,6 @@ sub verifyreceipt { return $string.&show_grading_menu_form($symb,$url); } -# -# Pick student and page/sequence for manual grading - - #--- This is called by a number of programs. #--- Called from the Grading Menu - View/Grade an individual student #--- Also called directly when one clicks on the subm button @@ -284,7 +286,7 @@ sub verifyreceipt { sub listStudents { my ($request) = shift; - my ($symb,$url) = &get_symb_and_url(); + 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'}; @@ -302,12 +304,14 @@ sub listStudents { $result.=''; my $viewgrade = $ENV{'form.handgrade'} eq 'yes' ? 'View/Grade' : 'View'; + $ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ? + &Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'}; $result='

 '. $viewgrade. ' Submissions for a Student or a Group of Students

'. - ''.$result; + '
'. - 'Problem: '.&Apache::lonnet::metadata($url,'title').'
'.$result; $request->print(< @@ -357,6 +361,11 @@ LISTJAVASCRIPT ''."\n". '
'."\n". '
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". ''."\n". ''."\n". 'To '.lc($viewgrade).' a submission, click on the check box next to the student\'s name. Then '."\n". @@ -367,7 +376,7 @@ LISTJAVASCRIPT 'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n". 'value="'.$viewgrade.'" />'."\n"; - my (undef,undef,$fullname) = &getclasslist($getsec,'0'); + my (undef,undef,$fullname) = &getclasslist($getsec,$ENV{'form.showgrading'} eq 'yes' ? '1' : '0'); $gradeTable.='
'. + 'Problem: '.$ENV{'form.probTitle'}.'
'. ''. @@ -459,7 +468,8 @@ sub sub_page_js { function updateRadio(formname,id,weight) { var gradeBox = eval("formname.GD_BOX"+id); var radioButton = eval("formname.RADVAL"+id); - var pts = checkSolved(formname,id) == 'update' ? gradeBox.value : weight; + var oldpts = eval("formname.oldpts"+id+".value"); + var pts = checkSolved(formname,id) == 'update' ? gradeBox.value : oldpts; gradeBox.value = pts; var resetbox = false; if (isNaN(pts) || pts < 0) { @@ -496,16 +506,17 @@ sub sub_page_js { stores.value = "0"; } - function writeBox(formname,id,pts,weight) { + function writeBox(formname,id,pts) { var gradeBox = eval("formname.GD_BOX"+id); if (checkSolved(formname,id) == 'update') { gradeBox.value = pts; } else { - gradeBox.value = weight; + var oldpts = eval("formname.oldpts"+id+".value"); + gradeBox.value = oldpts; var radioButton = eval("formname.RADVAL"+id); for (var i=0; i 600) { height = 600; scrollbar = "yes"; } -/* if (window.pWin) - window.pWin.close(); */ +// if (window.pWin) window.pWin.close(); pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx=70,screeny=75,width=600,height='+height); - pWin.document.write(""); - pWin.document.write("Message Central"); - - pWin.document.write(" @@ -905,7 +925,7 @@ sub gradeBox { while ($ctr<=$wgt) { $result.= '\n"; $result.=(($ctr+1)%10 == 0 ? '' : ''); $ctr++; @@ -964,7 +984,6 @@ sub show_problem { $result.='
'.$ctr."
'; $result.='

'; return $result; -# $request->print($result); } # --------------------------- show submissions of a student, option to grade @@ -972,24 +991,23 @@ sub submission { my ($request,$counter,$total) = @_; (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 ''; } 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 ''; -# if ($uname eq '') { &moreinfo($request,'Unable to find student'); return ''; } 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' : ''); -# $ENV{'form.vProb'} = $ENV{'form.vProb'} ne '' ? $ENV{'form.vProb'} : 'yes'; # 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: '. - &Apache::lonnet::metadata($url,'title').''."\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. @@ -1011,13 +1029,18 @@ sub submission { $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'} : &Apache::lonnet::metadata($url,'title'); + $keyhash{$symb.'_subject'} : $ENV{'form.probTitle'}; $ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0'; } $request->print(''."\n". ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". ''."\n". ''."\n". ''."\n". @@ -1081,7 +1104,7 @@ KEYWORDS my ($classlist,$fullname); if ($ENV{'form.handgrade'} eq 'yes') { my @col_list; - ($classlist,undef,$fullname) = &getclasslist('all','0'); + ($classlist,undef,$fullname) = &getclasslist('all',$ENV{'form.showgrading'} eq 'yes' ? '1' : '0'); for (keys (%$handgrade)) { my $ncol = &Apache::lonnet::EXT('resource.'.$_. '.maxcollaborators', @@ -1126,7 +1149,7 @@ KEYWORDS } if (scalar(@collaborators > $ncol)) { $result .= '
'; - $result .= 'This student has sumbitted too many '. + $result .= 'This student has submitted too many '. 'collaborators. Maximum is '.$ncol; $result .= '
'; } @@ -1195,6 +1218,9 @@ KEYWORDS # return if view submission with no grading option if ($ENV{'form.showgrading'} eq '') { $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; } @@ -1227,8 +1253,6 @@ KEYWORDS push @partlist,$partid; $request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); - -# $request->print($result); } $result=''."\n"; @@ -1281,9 +1305,7 @@ sub get_last_submission { for ($version=1;$version<=$returnhash{'version'};$version++) { foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) { $lasthash{$_}=$returnhash{$version.':'.$_}; -# if ($returnhash{$version.':'.$_} =~ /(SUBMITTED|DRAFT)$/) { $timestamp = scalar(localtime($returnhash{$version.':timestamp'})); -# } } } foreach ((keys %lasthash)) { @@ -1344,7 +1366,7 @@ sub processHandGrade { foreach (@msgnum) { $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne ''); } - $message =~ s/\s+/ /g; + #$message =~ s/\s+/ /g; $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom, $ENV{'form.msgsub'},$message); } @@ -1466,8 +1488,6 @@ sub processHandGrade { $ENV{'form.student'} = $uname; $ENV{'form.userdom'} = $udom; $ENV{'form.fullname'} = $$fullname{$_}; -# $ENV{'form.'.$_.':submitted_by'} = $submitter; -# print "submitter=$ENV{'form.'.$_.':submitted_by'}= $submitter:
"; &submission($request,$ctr,$total); $ctr++; } @@ -1514,11 +1534,11 @@ sub saveHandGrade { } $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'}"; &Apache::lonnet::cstore(\%newrecord,$symb, $ENV{'request.course.id'},$domain,$stuname); } @@ -1707,8 +1727,7 @@ sub viewgrades { my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'}); my $result='

Manual Grading

'; - $result.='Problem: '.&Apache::lonnet::metadata($ENV{'form.url'},'title') - .''."\n"; + $result.='Problem: '.$ENV{'form.probTitle'}.''."\n"; #view individual student submission form - called using Javascript viewOneStudent $result.=&jscriptNform($url,$symb); @@ -1718,7 +1737,13 @@ sub viewgrades { ''."\n". ''."\n". ''."\n". - ''."\n"; + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"; + $result.='

Assign Common Grade To '; if ($ENV{'form.section'} eq 'all') { $result.='Class

'; @@ -1729,12 +1754,6 @@ sub viewgrades { } $result.= '
'."\n". '
'; -# $result.='To assign the same score for all the students use the radio buttons or '. -# 'text box below. To assign scores individually fill in the score boxes for '. -# 'each student in the table below. A part that has already '. -# 'been graded does not get changed using the radio buttons or text box. '. -# 'If needed, it has to be changed individually.'; -# $result.='
'; #radio buttons/text box for assigning points for a section or class. #handles different parts of a problem my ($partlist,$handgrade) = &response_type($ENV{'form.url'}); @@ -1813,7 +1832,7 @@ sub viewgrades { #get info for each student #list all the students - with points and grade status - my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'0'); + my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1'); my $ctr = 0; foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) { my ($uname,$udom) = split(/:/); @@ -1884,10 +1903,8 @@ sub editgrades { my $symb=$ENV{'form.symb'}; my $url =$ENV{'form.url'}; my $title='

Current Grade Status

'; - $title.='Problem: '. - &Apache::lonnet::metadata($ENV{'form.url'},'title').'
'."\n"; + $title.='Problem: '.$ENV{'form.probTitle'}.'
'."\n"; $title.='Section: '.$ENV{'form.section'}.''."\n"; - $title.= &show_grading_menu_form ($symb,$url); my $result= '
'."\n"; $result.= ''. ''."\n"; @@ -1987,6 +2004,7 @@ sub editgrades { my $awarded = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type}; if ($awarded ne '' && $awarded ne $old_aw) { $newrecord{'resource.'.$part.'.'.$type}= $awarded; + $newrecord{'resource.'.$part.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; $updateflag=1; } $result .= ''. @@ -1996,12 +2014,12 @@ sub editgrades { $result .= ''."\n"; if ($updateflag) { $count++; - $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'}, $udom,$user); } } - $result .= '
UsernameFullname'.$old_aw.' 
'."\n"; + $result .= '
'."\n". + &show_grading_menu_form ($symb,$url); my $msg = 'Number of records updated = '.$rec_update. ' for '.$count.' student'.($count <= 1 ? '' : 's').'.
'. 'Total number of students = '.$ENV{'form.total'}.'
'; @@ -2109,8 +2127,7 @@ sub csvuploadmap_header { } my $result=''; - $result.=''; + $result.=''; my ($partlist,$handgrade) = &response_type($url); my ($resptype,$hdgrade)=('','no'); for (sort keys(%$handgrade)) { @@ -2141,6 +2158,11 @@ to this page if the data selected is ins value="$ENV{'form.upfile_associate'}" /> + + + + +
'."\n"; - - $result.='
Problem: '.&Apache::lonnet::metadata($url,'title') - .'
Problem: '.$ENV{'form.probTitle'}.'
'."\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; -} - -#--- Handgrading problems --- -sub viewGradeaStu_form { - my ($symb,$url,$response,$handgrade) = @_; - my ($classlist,$sections) = &getclasslist('all','0'); - my $result.='
'."\n"; - $result.=''."\n"; - $result.='
'."\n"; - $result.=' '; - $result.=($handgrade eq 'yes' ? 'View/Grade' : 'View').' 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
'; - if (ref($sections)) { - $result.=' (Section "no" implies the students were not assigned a section.)
' - if (grep /no/,@$sections); - } - - - $result.='
 '."\n"; - $result.='
'."\n"; - $result.='
'."\n"; - return $result; -} - -#--- Handgrading problems by page/sequence for each student --- -sub gradeByPage_form { - my ($symb,$url,$response,$handgrade) = @_; - my ($classlist,$sections) = &getclasslist('all','0'); - my $result.='
'."\n"; - $result.=''."\n"; - $result.='
'."\n"; - $result.=' '; - $result.='Handgrade an Individual Student\'s by Page/Sequence
'."\n"; - $result.=''."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n"; - - $result.=' Select section: '."\n"; - - $result.='
 '."\n".''."\n"; - $result.='
'."\n"; - $result.='
'."\n"; - return $result; -} - +#-------------- Next few routines handles grading by page/sequence +# +#--- Select a page/sequence and a student to grade sub pickStudentPage { my ($request) = shift; @@ -2455,8 +2308,7 @@ sub pickStudentPage { LISTJAVASCRIPT - my ($symb,$url) = &get_symb_and_url(); + 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'}; @@ -2499,7 +2357,7 @@ LISTJAVASCRIPT $result.='
'."
\n"; $result.=' Problems from: '."\n"; $ctr++; } - $result.=''."\n"; - $result.=''."\n"; + $result.=''."\n". + ''."\n"; $result.=' View Problems: no '."\n". ' yes '."
\n"; + $result.=' Submission Details: '. ' none'."\n". ' dates and submissions'."\n". ' all details'."\n"; + $result.=''."\n". - ''."\n". - ''."\n". - ''."

\n"; + ''."\n". + ''."\n". + ''."

\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"; + + $result.='
 
'."\n"; + $request->print($result); - my $studentTable.=' Select a Student you wish to grade
'. + my $studentTable.=' Select a student you wish to grade
'. '
'. ''. ''. @@ -2540,7 +2408,7 @@ LISTJAVASCRIPT ''. ''; - my (undef,undef,$fullname) = &getclasslist($getsec,'0'); + my (undef,undef,$fullname) = &getclasslist($getsec,'1'); my $ptr = 1; foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) { my ($uname,$udom) = split(/:/,$student); @@ -2564,7 +2432,8 @@ LISTJAVASCRIPT } sub getSymbMap { - my $navmap = Apache::lonnavmaps::navmap-> new( + my ($request) = @_; + my $navmap = Apache::lonnavmaps::navmap-> new($request, $ENV{'request.course.fn'}.'.db', $ENV{'request.course.fn'}.'_parms.db',1, 1); @@ -2620,15 +2489,17 @@ sub getSymbMap { return \@titles,\%symbx; } +# +#--- Displays a page/sequence w/wo problems, w/wo submissions sub displayPage { my ($request) = shift; - my ($symb,$url) = &get_symb_and_url(); + 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 $pageTitle = $ENV{'form.page'}; - my (undef,undef,$fullname) = &getclasslist($getsec,'0'); + my (undef,undef,$fullname) = &getclasslist($getsec,'1'); my ($uname,$udom) = split(/:/,$ENV{'form.student'}); my $result='

 '.$ENV{'form.title'}.'

'; @@ -2638,7 +2509,7 @@ sub displayPage { &sub_page_js($request); $request->print($result); - my $navmap = Apache::lonnavmaps::navmap-> new( + my $navmap = Apache::lonnavmaps::navmap-> new($request, $ENV{'request.course.fn'}.'.db', $ENV{'request.course.fn'}.'_parms.db',1, 1); my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'}); @@ -2648,12 +2519,16 @@ sub displayPage { $map->map_finish()); my $studentTable=''."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n"; + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"; my $checkIcon = ''; @@ -2674,7 +2549,7 @@ sub displayPage { if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) { my $parts = $curRes->parts(); - if (scalar(@{$parts}) > 1) { shift @{$parts}; } + $parts = &temp_parts_fix($parts); # remove line when lonnavmap is fixed my $title = $curRes->compTitle(); my $symbx = $curRes->symb(); $studentTable.=''; + $displaySub[2].=(exists $record{"$version:resource.regrader"}) ? + $record{"$version:resource.regrader"} : ''; + $studentTable.=''; } $studentTable.='
 Fullname (username) Fullname (username) Fullname (username)
'.$question. @@ -2715,6 +2590,8 @@ sub displayPage { my @displaySub = (); foreach my $partid (@{$parts}) { my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys; + next if ($record{"$version:resource.$partid.award"} eq 'APPROX_ANS' && + $record{"$version:resource.$partid.solved"} eq ''); $displaySub[0].=(exists $record{$version.':'.$matchKey[0]}) ? 'Part: '.$partid.' Submission: ' .$record{$version.':'.$matchKey[0]}.'
' : ''; @@ -2722,10 +2599,13 @@ sub displayPage { 'Part: '.$partid.' '. $record{"$version:resource.$partid.award"}.'/'. $record{"$version:resource.$partid.solved"}.'
' : ''; + $displaySub[2].=(exists $record{"$version:resource.$partid.regrader"}) ? + $record{"$version:resource.$partid.regrader"}.' (Part: '.$partid.')' : ''; } - $displaySub[1].=(exists $record{"$version:resource.regrader"}) ? - 'Manually graded by '.$record{"$version:resource.regrader"} : ''; - $studentTable.='		'.$displaySub[0].' '.$displaySub[1].' 
'.$displaySub[0].' '.$displaySub[1]. + ($displaySub[2] eq '' ? '' : 'Manually graded by '.$displaySub[2]).' 
'; } @@ -2748,7 +2628,6 @@ sub displayPage { $curRes = $iterator->next(); $ctr++; } - $navmap->init(); $studentTable.=''."\n". '   0); + $seen{$_}++; + push @correctParts,$_; + } + return \@correctParts; +} + sub updateGradeByPage { my ($request) = shift; @@ -2767,7 +2658,7 @@ sub updateGradeByPage { my $cnum = $ENV{"course.$ENV{'request.course.id'}.num"}; my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'}; my $pageTitle = $ENV{'form.page'}; - my (undef,undef,$fullname) = &getclasslist($getsec,'0'); + my (undef,undef,$fullname) = &getclasslist($getsec,'1'); my ($uname,$udom) = split(/:/,$ENV{'form.student'}); my $result='

 '.$ENV{'form.title'}.'

'; @@ -2776,7 +2667,7 @@ sub updateGradeByPage { $request->print($result); - my $navmap = Apache::lonnavmaps::navmap-> new( + my $navmap = Apache::lonnavmaps::navmap-> new($request, $ENV{'request.course.fn'}.'.db', $ENV{'request.course.fn'}.'_parms.db',1, 1); my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'}); @@ -2801,7 +2692,7 @@ sub updateGradeByPage { if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) { my $parts = $curRes->parts(); - if (scalar(@{$parts}) > 1) { shift @{$parts}; } + $parts = &temp_parts_fix($parts); # remove line when lonnavmap is fixed my $title = $curRes->compTitle(); my $symbx = $curRes->symb(); $studentTable.=''.$question. @@ -2844,11 +2735,11 @@ sub updateGradeByPage { } $newrecord{'resource.'.$partid.'.awarded'} = $partial if $partial ne ''; $newrecord{'resource.'.$partid.'.solved'} = $score; + $newrecord{'resource.'.$partid.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; $changeflag++; } if (scalar(keys(%newrecord)) > 0) { - $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; &Apache::lonnet::cstore(\%newrecord,$symbx,$ENV{'request.course.id'}, $udom,$uname); } @@ -2860,53 +2751,370 @@ sub updateGradeByPage { $curRes = $iterator->next(); $ctr++; } - $navmap->init(); $studentTable.=''; - $studentTable.=($changeflag == 0 ? 'No score was changed or updated.' : - 'The scores were changed for '. - $changeflag.' problem'.($changeflag == 1 ? '.' : 's.')); $studentTable.=&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'}); - $request->print($studentTable); + my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' : + 'The scores were changed for '. + $changeflag.' problem'.($changeflag == 1 ? '.' : 's.')); + $request->print($grademsg.$studentTable); return ''; } +#-------- end of section for handling grading by page/sequence --------- +# +#------------------------------------------------------------------- -#--- Form to input a receipt number --- -sub verifyReceipt_form { - my ($symb,$url) = @_; - my $result = ''."\n"; +#--------------------Scantron Grading----------------------------------- +# +#------ start of section for handling grading by page/sequence --------- + +sub getSequenceDropDown { + my ($request,$symb)=@_; + my $result=''; + return $result; +} + +sub scantron_selectphase { + my ($r) = @_; + my ($symb,$url)=&get_symb_and_url($r); + if (!$symb) {return '';} + my $sequence_selector=&getSequenceDropDown($r,$symb); + my $result; + $result.= < + + + + + + + +
+ + + + + + + + + + +
+  Specify file location and which Folder/Sequence to grade +
+ Sequence to grade: $sequence_selector +
+ + Filename of scoring office file: + +
+
+ + +SCANTRONFORM + + return $result; +} + +sub scantron_configphase { + my ($r) = @_; + my $sequence=$ENV{'form.selectpage'}; + my $result; + $result.="got page $sequence"; + $Apache::lonxml::debug=1; + &Apache::lonhomework::showhash(%ENV); + $Apache::lonxml::debug=0; + #FIXME Needs to present some lines from the file and allow the instructor to specify which columns represent what data, possibly have some nice defaults setup, probably should do a pass through all problems for a student to get an idea of how many questions there are, and homw many lines we'll have, + return $result; +} + +sub scantron_process_students { + #FIXME + # loop through students, { + # Check if studnet info valid, if not add line to delay queue + # foreach question 'submit' the students answer to the server + # through grade target { + # generate data to pass back that includes grade recevied + # } + # } + # loop through delay queue { + # print out each delayed student with interface to select how + # to repair student provided info + # Expected errors include + # 1 bad/no stuid/username + # 2 invalid bubblings + # } + # if delay queue exists 2 submits one to process delayed students one + # to ignore delayed students, possibly saving the delay queue for later + +} +#-------- end of section for handling grading scantron forms ------- +# +#------------------------------------------------------------------- + + +#-------------------------- Menu interface ------------------------- +# +#--- Show a Grading Menu button - Calls the next routine --- +sub show_grading_menu_form { + my ($symb,$url)=@_; + my $result.='
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + '
'."\n"; + return $result; +} - my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}); - $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.=''; +#--- Displays the main menu page ------- +sub gradingmenu { + my ($request) = @_; + my ($symb,$url)=&get_symb_and_url($request); + if (!$symb) {return '';} + my $probTitle = &Apache::lonnet::gettitle($symb); + my $saveCmd = ($ENV{'form.saveCmd'} eq '' ? 'pickStudentPage' : $ENV{'form.saveCmd'}); + my $saveSec = ($ENV{'form.saveSec'} eq '' ? 'all' : $ENV{'form.saveSec'}); + my $saveSub = ($ENV{'form.saveSub'} eq '' ? 'yes' : $ENV{'form.saveSub'}); + my $saveStatus = ($ENV{'form.saveStatus'} eq '' ? 'Active' : $ENV{'form.saveStatus'}); + + $request->print(< + function checkChoice(formname) { + var cmd = formname.command; + formname.saveCmd.value = radioSelection(cmd); + formname.saveSec.value = pullDownSelection(formname.section); + formname.saveSub.value = radioSelection(formname.submitonly); + formname.saveStatus.value = pullDownSelection(formname.status); + if (cmd[0].checked || cmd[1].checked || cmd[2].checked || cmd[4].checked) formname.submit(); + + if (cmd[3].checked) browseAndUpload(); + + if (cmd[5].checked) { + if (!checkReceiptNo(formname,'notOK')) { return false;} + formname.submit(); + } } - if ($ENV{'form.symb'}) { - $result.=''; + + function checkReceiptNo(formname,nospace) { + var receiptNo = formname.receipt.value; + var checkOpt = false; + if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;} + if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;} + if (checkOpt) { + alert("Please enter a receipt number given by a student in the receipt box."); + formname.receipt.value = ""; + formname.receipt.focus(); + return false; + } + formname.command[5].checked = true; + return true; + } + + function radioSelection(radioButton) { + var selection=null; + if (radioButton.length > 1) { + for (var i=0; i 1) { + for (var i=0; i"); + lDoc.write("Browse And Upload"); + + lDoc.write(" +GRADINGMENUJS + + my $result='

 Manual Grading/View Submission

'. + ''. + ''."\n"; + my ($partlist,$handgrade) = &response_type($url); + my ($resptype,$hdgrade)=('','no'); + for (sort keys(%$handgrade)) { + my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_}); + $resptype = $responsetype; + $hdgrade = $handgrade if ($handgrade eq 'yes'); + $result.=''. + ''. + ''; + } + $result.='
Problem: '.$probTitle.'
Part '.(split(/_/))[0].'Type: '.$responsetype.'Handgrade: '.$handgrade.'
'."\n"; + + my (undef,$sections) = &getclasslist('all','0'); + + $result.=''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"; + + $result.='
'."\n". + ''."\n". + '
'."\n". + ' Select a Grading/Viewing Option
'."\n"; + + $result.=''. + ''."\n". + + ''."\n". + + ''."\n". + ''."\n". + + ''."\n"; + + $result.=''."\n"; + + if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) { + $result.=''. + ''."\n"; + } + + $result.=''; + + $result.='
'. + ' '. + 'Handgrade/View Submission for a student by page/sequence
'. + ' '. + 'Grade by section or class
'. + ($hdgrade eq 'yes' ? 'View/Grade essay response of' : 'View'). + ' an individual student --> For students who has: '. + ' submitted'. + ' everybody
'. + ' '. + 'Upload scores from file
'. + ' '. + 'Grade scantron forms
'. + ' '. + 'Verify a submission receipt issued by this server--> Receipt no: '.unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}). + '-'. + '

'."\n". + ' Select section:   '; + + $result.='Student Status:'; + + $result.='   (Applies to the first three options only.)'."\n"; + + if (ref($sections)) { + $result.=' (Section "no" implies the students were not assigned a section.)
' + if (grep /no/,@$sections); + } + $result.='

'. + ''."\n". + '
'."\n". + '
'."\n". + '
'."\n"; return $result; } @@ -2961,9 +3169,6 @@ sub handler { $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); if ($command eq 'submission') { ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0)); -# if ($command eq 'submission') { -# &listStudents($request) if ($ENV{'form.student'} eq ''); -# &submission($request,0,0) if ($ENV{'form.student'} ne ''); } elsif ($command eq 'pickStudentPage') { &pickStudentPage($request); } elsif ($command eq 'displayPage') { @@ -2982,6 +3187,8 @@ sub handler { $request->print(&editgrades($request)); } elsif ($command eq 'verify') { $request->print(&verifyreceipt($request)); + } elsif ($command eq 'csvform') { + $request->print(&upcsvScores_form($request)); } elsif ($command eq 'csvupload') { $request->print(&csvupload($request)); } elsif ($command eq 'viewclasslist') { @@ -2999,6 +3206,10 @@ sub handler { } $request->print(&csvuploadmap($request)); } + } elsif ($command eq 'scantron_selectphase') { + $request->print(&scantron_selectphase($request)); + } elsif ($command eq 'scantron_configphase') { + $request->print(&scantron_configphase($request)); } else { $request->print("Unknown action: $command:"); }