--- loncom/homework/grades.pm 2001/08/06 16:37:58 1.12 +++ loncom/homework/grades.pm 2002/08/02 21:10:03 1.44 @@ -1,14 +1,37 @@ -# The LON-CAPA grading handler. +# The LearningOnline Network with CAPA +# The LON-CAPA Grading handler # -# Handles the viewing of grades. +# $Id: grades.pm,v 1.44 2002/08/02 21:10:03 ng Exp $ # -# YEAR=2001 -# 2/7,2/9,2/13,4/16,4/17,5/1 Guy Albertelli +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# +# 2/9,2/13 Guy Albertelli # 6/8 Gerd Kortemeyer -# 7/26 Guy Albertelli -# 7/27 H.K. Ng -# 7/30 Guy Albertelli -# 8/6 Scott Harrison +# 7/26 H.K. Ng +# 8/20 Gerd Kortemeyer +# Year 2002 +# June-August H.K. Ng +# package Apache::grades; use strict; @@ -17,415 +40,2190 @@ use Apache::lonxml; use Apache::lonnet; use Apache::loncommon; use Apache::lonhomework; +use Apache::lonmsg qw(:user_normal_msg); use Apache::Constants qw(:common); -# ======================================================== Get more information +# ----- These first few routines are general use routines.----- +# +# --- Retrieve the parts that matches stores_\d+ from the metadata file.--- +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); + } + } + return @parts; +} + +# --- Get the symbolic name of a problem and the url +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); +} + +# --- Retrieve the fullname for a user. Return lastname, first middle --- +# --- Generation is attached next to the lastname if it exists. --- +sub get_fullname { + my ($uname,$udom) = @_; + my %name=&Apache::lonnet::get('environment', ['lastname','generation', + 'firstname','middlename'],$udom,$uname); + 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; +} + +#--- Get the partlist and the response type for a given problem. --- +#--- Indicate if a response type is coded handgraded or not. --- +sub response_type { + my ($url) = shift; + my $allkeys = &Apache::lonnet::metadata($url,'keys'); + my %seen = (); + my (@partlist,%handgrade); + foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) { + if (/^\w+response_\d+.*/) { + my ($responsetype,$part) = split(/_/,$_,2); + my ($partid,$respid) = split(/_/,$part); + $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no'); + next if ($seen{$partid} > 0); + $seen{$partid}++; + push @partlist,$partid; + } + } + return \@partlist,\%handgrade; +} + +#--- Prints a message on screen if a user did something wrong +#--- Operator error --- +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 ''; +} + +#--- Dumps the class list with usernames,list of sections, +#--- section, ids and fullnames for each user. +sub getclasslist { + my ($getsec,$hideexpired) = @_; + my $now = time; + my %classlist=&Apache::lonnet::dump('classlist', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + # codes to check for fields in the classlist + # should contain end:start:id:section:fullname + for (keys %classlist) { + my (@fields) = split(/:/,$classlist{$_}); + %classlist = &reformat_classlist(\%classlist) if (scalar(@fields) <= 2); + last; + } + + my (@holdsec,@sections,%allids,%stusec,%fullname); + foreach (keys(%classlist)) { + my ($end,$start,$id,$section,$fullname)=split(/:/,$classlist{$_}); + # still a student? + if (($hideexpired) && ($end) && ($end < $now)) { + next; + } + $section = ($section ne '' ? $section : 'no'); + push @holdsec,$section; + if ($getsec eq 'all' || $getsec eq $section) { + push (@{ $classlist{$getsec} }, $_); + $allids{$_} =$id; + $stusec{$_} =$section; + $fullname{$_}=$fullname; + } + } + my %seen = (); + foreach my $item (@holdsec) { + push (@sections, $item) unless $seen{$item}++; + } + return (\%classlist,\@sections,\%allids,\%stusec,\%fullname); +} + +# add id, section and fullname to the classlist.db +# done to maintain backward compatibility with older versions +sub reformat_classlist { + my ($classlist) = shift; + foreach (sort keys(%$classlist)) { + my ($unam,$udom) = split(/:/); + my $section = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'}); + my $fullname = &get_fullname ($unam,$udom); + my %userid = &Apache::lonnet::idrget($udom,($unam)); + $$classlist{$_} = $$classlist{$_}.':'.$userid{$unam}.':'.$section.':'.$fullname; + } + my $putresult = &Apache::lonnet::put + ('classlist',\%$classlist, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + + return %$classlist; +} + +#find user domain +sub finduser { + my ($name) = @_; + my $domain = ''; + if ( $Apache::grades::viewgrades eq 'F' ) { + my %classlist=&Apache::lonnet::dump('classlist', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my (@fields) = grep /^$name:/, keys %classlist; + ($name, $domain) = split(/:/,$fields[0]); + return ($name,$domain); + } else { + return ($ENV{'user.name'},$ENV{'user.domain'}); + } +} + +#--- 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('
'."\n"); - $request->print(''."\n"); - $request->print(''."\n"); - $request->print("Student:". - ''."
\n"); - $request->print("Domain:". - ''."
\n"); - $request->print(''."
\n"); + if ($ENV{'form.url'}) { + $request->print(''."\n"); + } + if ($ENV{'form.symb'}) { + $request->print(''."\n"); + } + $request->print(''."\n"); + $request->print("Student:".''."
\n"); + $request->print("Domain:".''."
\n"); + $request->print(''."
\n"); $request->print('
'); } return ''; } -# ========================================= Displays the class list of students +#--- 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; +} + + +#------------------ End of general use routines -------------------- +#------------------------------------------------------------------- + +#------------------------------------ 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); + } + + my $jscript=''."\n"; + $jscript.= '
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + '
'."\n"; + + my $title.='

Verifying Submission Receipt '. + $receipt.'

'."\n". + 'Resource: '.$ENV{'form.url'}.'

'."\n"; + + my ($string,$contents,$matches) = ('','',0); + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist('all','0'); + + foreach (sort {$$fullname{$a} cmp $$fullname{$b} } keys %$fullname) { + my ($uname,$udom)=split(/\:/); + if ($receipt eq + &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) { + $contents.=' '."\n". + ''.$$fullname{$_}.' '."\n". + ' '.$uname.' '. + ' '.$udom.' '."\n"; + + $matches++; + } + } + if ($matches == 0) { + $string = $title.'No match found for the above receipt.'; + } else { + $string = $jscript.$title. + 'The above receipt matches the following student'. + ($matches <= 1 ? '.' : 's.')."\n". + '
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + $contents. + '
 Fullname  Username  Domain 
'."\n"; + } + return $string.&show_grading_menu_form ($symb,$url); +} + +#--- 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 +# on the problem page. sub listStudents { my ($request) = shift; - my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); - my $chome = $ENV{"course.$ENV{'request.course.id'}.home"}; - $request->print ("Found $cdom:$cnum:$chome
"); - my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0'); - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { - my ($sname,$sdom) = split(/:/,$student); - my $reply = &Apache::lonnet::reply('get:'.$sdom.':'.$sname. - ':environment:lastname&generation&firstname&middle'. - 'name',&Apache::lonnet::homeserver($sname,$sdom)); - print "reply=$reply
"; - my (@nameparts) = split /&/,$reply; -# my $sfullname = $Apache::lonnet::unescape($nameparts[0]); + 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='

 '. + 'View Submissions for a Student or a Group of Students

'; + $result.=''; + $result.=''; + my ($partlist,$handgrade) = &response_type($ENV{'form.url'}); + for (sort keys(%$handgrade)) { + my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_}); + $ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes'); + $result.=''. + ''. + ''; + } + $result.='
'. + 'Resource: '.$ENV{'form.url'}.'
Part '.(split(/_/))[0].'Type: '.$responsetype.'Handgrade: '.$handgrade.'
'; + $request->print($result); + + $request->print(< + View Problem: no + yes
+ Submissions: + handgrade only + last sub only + last sub & parts info + all details + + + +
+
+ +ENDTABLEST + if ($ENV{'form.url'}) { + $request->print(''."\n"); + } + if ($ENV{'form.symb'}) { + $request->print(''."\n"); + } + $request->print(''."\n"); + + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($getsec,'0'); + + $result='
'. + ''. + ''. + ''; + foreach (sort(@$partlist)) { + $result.=''; + } + $request->print($result.''."\n"); + + foreach my $student (sort {$$fullname{$a} cmp $$fullname{$b} } keys %$fullname) { + my ($uname,$udom) = split(/:/,$student); + my (%status) = &student_gradeStatus($ENV{'form.url'}, + $ENV{'form.symb'},$udom,$uname,$partlist); + my $statusflg = ''; + foreach (keys(%status)) { + $statusflg = 1 if ($status{$_} ne 'nothing'); + my ($foo,$partid,$foo1) = split(/\./,$_); + if ($status{'resource.'.$partid.'.submitted_by'} ne '') { + $statusflg = ''; + $request->print(''); + } + } + next if ($statusflg eq '' && $submitonly eq 'yes'); + if ( $Apache::grades::viewgrades eq 'F' ) { - $request->print(''."\n"); - $request->print("$sname @nameparts\n"); - $request->print(''."\n"); - $request->print(''."\n"); - $request->print(''."\n"); - $request->print(''."\n"); - $request->print(''."
\n"); - $request->print(''); + $result=''. + ''."\n". + ''."\n". + ''."\n". + ''."\n"; + + foreach (sort keys(%status)) { + next if (/^resource.*?submitted_by$/); + $result.=''."\n"; + } + $request->print($result.''."\n"); } } + $request->print('
 Select  Fullname  Username  Domain  Part '.(split(/_/))[0].' Status 
 '.$$fullname{$student}.'  '.$uname.'  '.$udom.'  '.$status{$_}.' 
'); + $request->print('
'); + return ''; } -# ========== Finds a user based on a name substring (returns a 2 element array) -#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'}); - my $chome = $ENV{"course.$ENV{'request.course.id'}.home"}; - #print "Found $cdom:$cnum:$chome
"; - my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0'); - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { - my ($posname,$posdomain) = split(/:/,$student); - if ($posname =~ $name) { - $name = $posname; - $domain = $posdomain; - last; +#---- Called from the listStudents routine +# Displays the submissions for one student or a group of students +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 ($uname,$udom,$fullname) = split(/:/); + $ENV{'form.student'} = $uname; + $ENV{'form.userdom'} = $udom; + $ENV{'form.fullname'} = $fullname; + &submission($request,$ctr,$total); + $ctr++; + } + return ''; +} + +#------------------------------------------------------------------------------------ +# +#-------------------------- Next few routines handles grading by student, essentially +# handles essay response type problem/part +# +#--- Javascript to handle the submission page functionality --- +sub sub_page_js { + my $request = shift; + $request->print(< + function updateRadio(radioButton,formtextbox,formsel,scores,weight) { + 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 weight) { + var resp = confirm("You entered a value ("+pts+ + ") greater than the weight for the part. Accept?"); + if (resp == false) { + formtextbox.value = ""; + return; + } + } + + for (var i=0; i 600) { + height = 600; + scrollbar = "yes"; + } +/* 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(" +SUBJAVASCRIPT +} + + +# --------------------------- 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'})--; +# 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'; + my ($classlist,$seclist,$ids,$stusec,$fullname); + + # header info + if ($counter == 0) { + &sub_page_js($request); + $request->print('

 Submission Record

'. + ' Resource: '.$url.''); + + # 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') { + 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'}); + my $result.='
'; + $result.='
'; + $result.=' View of the problem for '.$ENV{'form.fullname'}. + '
'.$rendered.'
'; + $result.='Correct answer:
'.$companswer; + $result.='
'; + $result.='

'; + $request->print($result); + } + + # 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'} : &Apache::lonnet::metadata($url,'title'); + $ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0'; + + } + + $request->print(''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"); + + my ($cts,$prnmsg) = (1,''); + while ($cts <= $ENV{'form.savemsgN'}) { + $prnmsg.=''."\n"; + $cts++; + } + $request->print($prnmsg); + + if ($ENV{'form.handgrade'} eq 'yes' && $ENV{'form.showgrading'} eq 'yes') { + $request->print(<Keyword Options:  +List    +Paste Selection to List    +Highlight Attribute

+KEYWORDS + } + } + + my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); + my ($partlist,$handgrade) = &response_type($url); + + # Display student info + $request->print(($counter == 0 ? '' : '
')); + my $result='
'. + '
'; + +# $result.=''; + } else { + for my $part (sort keys(%$handgrade)) { + foreach (@$string) { + my ($partid,$respid) = /^resource\.(\d+)\.(\d+)\.submission/; + if ($part eq ($partid.'_'.$respid)) { + my ($ressub,$subval) = split(/:/,$_,2); + $lastsubonly.='' + if ($ENV{'form.lastSub'} eq 'lastonly' || + ($ENV{'form.lastSub'} eq 'hdgrade' && + $$handgrade{$part} =~ /:yes$/)); + } + } + } + } + $lastsubonly.='
Fullname: '.$ENV{'form.fullname'}. + $result.='Fullname: '.$ENV{'form.fullname'}. + '   Username: '.$uname.''. + '   Domain: '.$udom.'
'; + + # If this is handgraded, then check for collaborators + my $col_flag = 0; + if ($ENV{'form.handgrade'} eq 'yes') { + my @col_list; + ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist('all','0'); + for (keys (%$handgrade)) { + my $ncol = &Apache::lonnet::EXT('resource.'.$_. + '.maxcollaborators',$symb,$udom,$uname); + if ($ncol > 0) { + s/\_/\./g; + if ($record{'resource.'.$_.'.collaborators'} ne '') { + my (@collaborators) = split(/,?\s+/, + $record{'resource.'.$_.'.collaborators'}); + my (@badcollaborators); + if (scalar(@collaborators) != 0) { + $result.='Collaborators: '; + foreach my $collaborator (@collaborators) { + $collaborator = $collaborator =~ /\@|:/ ? + (split(/@|:/,$collaborator))[0] : $collaborator; + next if ($collaborator eq $uname); + if (!grep /^$collaborator:/i,keys %$classlist) { + push @badcollaborators,$collaborator; + next; + } + $col_flag++; + push @col_list, $collaborator; + $result.=$$fullname{$collaborator.':'.$udom}.'     '; + } + $result.='
'."\n"; + $result.='
'. + 'This student has submitted '. + (scalar (@badcollaborators) > 1 ? '' : 'an'). + ' invalid collaborator'.(scalar (@badcollaborators) > 1 ? 's. ' : '. '). + (join ', ',@badcollaborators).'
' + if (scalar(@badcollaborators) > 0); + + $result.='
'. + 'This student has submitted too many collaborators. Maximum is '. + $ncol.'.
' if (scalar(@collaborators) > $ncol); + $result.=''."\n"; + } + } } } - return ($name,$domain); + } + $request->print($result."\n"); + + # print student answer/submission + # Options are (1) Handgaded submission only + # (2) Last submission, includes submission that is not handgraded + # (for multi-response type part) + # (3) Last submission plus the parts info + # (4) The whole record for this student + if ($ENV{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) { + if ($ENV{'form.'.$uname.':'.$udom.':submitted_by'}) { + my $submitby=''. + 'Collaborative submission by: '. + ''. + $$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.''; + $request->print($submitby); + } else { + my ($string,$timestamp)= + &get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'}); + my $lastsubonly.=''. + ($$timestamp eq '' ? '' : 'Date Submitted: '. + $$timestamp).''; + if ($$timestamp eq '') { + $lastsubonly.='
'.$$string[0].'
Part '. + $partid.' ( ID '.$respid. + ' )   Answer: '. + &keywords_highlight($subval).'
'."\n"; + $request->print($lastsubonly); + } } else { - return ($ENV{'user.name'},$ENV{'user.domain'}); + $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, + $ENV{'request.course.id'}, + $last,'.submission', + 'Apache::grades::keywords_highlight')); + } + + # return if view submission with no grading option + if ($ENV{'form.showgrading'} eq '') { + $request->print('
'); + return; } -} -# ===================================== Gets a class list (returns a hash list) -sub getclasslist { - my ($coursedomain,$coursenum,$coursehome,$hideexpired) = @_; - my $classlist = &Apache::lonnet::reply('dump:'.$coursedomain.':'. - $coursenum.':classlist',$coursehome); - my %classlist = (); - my $now = time; - foreach my $record (split /&/, $classlist) { - my ($name,$value)=split(/=/,&Apache::lonnet::unescape($record)); - my ($end,$start)=split(/:/,$value); - # still a student? - if (($hideexpired) && ($end) && ($end < $now)) { - print "Skipping:$name:$end:$now
\n"; - next; + # Grading options + $result=''."\n". + ''."\n". + ''."\n"; + $result.=' '. + 'Compose Message to student'.($col_flag > 1 ? 's' : '').''. + '
 (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; + 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 $score = ($record{'resource.'.$partid.'.awarded'} eq '' ? + '' : $record{'resource.'.$partid.'.awarded'}*$wgt); + $result=''; + $result.=''; + $result.=''."\n"; + $result.='
Part '.$partid.' Points: '; + + my $ctr = 0; + $result.=''; # display radio buttons in a nice table 10 across + while ($ctr<=$wgt) { + $result.= '\n"; + $result.=(($ctr+1)%10 == 0 ? '' : ''); + $ctr++; } - print "record=$record
"; - push( @{ $classlist{'allids'} }, $name); + $result.='
'.$ctr."
'; + + $result.='		 or /'.$wgt.' '.$wgtmsg.' '; + + $result.=''."  \n"; + $result.=''; + $result.='
'; + $request->print($result); } - return (%classlist); + $request->print(''."\n"); + $request->print('
'."\n"); + + # 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 ''; } -# ============================== Get parts of a stored value (returns an array) -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); +#--- Retrieve the last submission for all the parts +sub get_last_submission { + my ($symb,$username,$domain,$course)=@_; + if ($symb) { + my (@string,$timestamp); + 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$/) { + my ($partid,$foo) = split(/submission$/,$_); + my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? + 'Draft Copy ' : ''; + push @string, (join(':',$_,$draft.$lasthash{$_})); + } + if ($_ =~ /timestamp/) {$timestamp = scalar(localtime($lasthash{$_}))}; + } } + @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string; + return \@string,\$timestamp; } - return @parts; } -# =================================== Displays student grade (returns a string) -sub viewstudentgrade { - my ($url,$symb,$courseid,$student,@parts) = @_; - my $result = ''; - my $cellclr = '"#ffffdd"'; - my ($stuname,$domain) = split(/:/,$student); - my %record = &Apache::lonnet::restore($symb,$courseid,$domain,$stuname); - $result .= "$stuname$domain\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"; - } elsif ($type eq 'solved') { - my $score = $record{"resource.$part.$type"}; - $result .= "". - "\n"; + 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++; } } - $result .= ''; - return $result; + + # 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 ''; + } + + # 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 ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0'); + my (@parsedlist,@nextlist); + my ($nextflg) = 0; + foreach (sort {$$fullname{$a} cmp $$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++; + } + + $ctr = 0; + my $total = scalar(@nextlist)-1; + + foreach (sort @nextlist) { + my ($uname,$udom,$submitter) = split(/:/); + $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++; + } + 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 ''; } -# ========================================================== Sets student grade -#FIXME need to look at the meatdata spec -# on what type of data to accept and provide an -#interface based on that, also do that to above function. -sub setstudentgrade { - my ($url,$symb,$courseid,$student,@parts) = @_; - my $result =''; - my ($stuname,$domain) = split(/:/,$student); - my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname); +#---- Save the score and award for each student, if changed +sub saveHandGrade { + my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter) = @_; + 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.$student.$part.$type"}; - 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'; } - } else { - #$result.="$stuname:$part:$type:unchanged $oldscore to $newscore:
\n"; - } - if ($update) { $newrecord{"resource.$part.$type"}=$newscore; } + foreach (split(/:/,$ENV{'form.partlist'.$newflg})) { + if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq 'excused') { + $newrecord{'resource.'.$_.'.solved'} = 'excused' + if ($record{'resource.'.$_.'.solved'} ne 'excused'); } else { - if ($oldscore ne $newscore) { - $newrecord{"resource.$part.$type"}=$newscore; - $result .= "Updating $student"."'s status for $part.$type to ". - "$newscore
\n"; + my $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ? + $ENV{'form.GD_BOX'.$newflg.'_'.$_} : + $ENV{'form.RADVAL'.$newflg.'_'.$_}); + if ($pts eq '') { + &userError($request,'No point was assigned for part '.$_. + ' and for username '.$stuname.'.'); + return 'error'; + } + my $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 { - #$result.="$stuname:$part:$type:unchanged $oldscore to $newscore:
\n"; + $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)); } } - if ( scalar(keys(%newrecord)) > 0 ) { - $newrecord{"resource.regrader"} = $ENV{'user.name'}.':'. - $ENV{'user.domain'}; - &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname); - - $result .= 'Stored away '.scalar(keys(%newrecord)). - " elements.
\n"; + + 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); } - return $result; + return ''; } +#-------------------------------------------------------------------------------------- +# +#-------------------------- 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; -# ========================================================== Attempt submission -sub submission { - my ($request) = @_; - my $url = $ENV{'form.url'}; - $url =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; - if ($ENV{'form.student'} eq '') { - &moreinfo($request,"Need student login id"); return ''; } -# if ($ENV{'form.student'} eq '') { &listStudents($request); return ''; } - my ($uname,$udom) = &finduser($ENV{'form.student'}); - if ($uname eq '') { - &moreinfo($request,"Unable to find student"); return ''; } - my $symb=&Apache::lonnet::symbread($url); - if ($symb eq '') { - $request->print("Unable to handle ambiguous references:$url:."); - return ''; } - my $answer = &Apache::loncommon::get_previous_attempt($symb,$uname,$udom, - $ENV{'request.course.id'}); - my $result = "

Submission Record

$uname:$udom for $url
". - $answer; - return $result; + $request->print(< + function viewOneStudent(user,domain) { + document.onestudent.student.value = user; + document.onestudent.userdom.value = domain; + document.onestudent.submit(); + } + + function writePoint(partid,weight,point) { + var radioButton = eval("document.classgrade.RADVAL_"+partid); + var textbox = eval("document.classgrade.TEXTVAL_"+partid); + if (point == "textval") { + var point = eval("document.classgrade.TEXTVAL_"+partid+".value"); + if (isNaN(point) || point < 0) { + alert("A number equal or greater than 0 is expected. Entered value = "+point); + var resetbox = false; + for (var i=0; i weight) { + var resp = confirm("You entered a value ("+point+ + ") greater than the weight for the part. Accept?"); + if (resp == false) { + textbox.value = ""; + return; + } + } + for (var i=0; i weight) { + var resp = confirm("You entered a value ("+point+ + ") greater than the weight of the part. Accept?"); + if (resp == false) { + textbox.value = ""; + return; + } + } + selval[0].selected = true; + } + + function changeOneScore(partid,user) { + var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_sv"); + if (selval[1].selected) { + var boxval = eval("document.classgrade.GD_"+user+'_'+partid+"_aw"); + boxval.value = ""; + } + } + + function resetEntry(numpart) { + for (ctpart=0;ctpart +VIEWJAVASCRIPT } -# ================================================================= View grades +#--- show scores for a section or whole class w/ option to change/update a score sub viewgrades { - my ($request) = @_; - my $result = ''; - - #get resource reference - 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 ''; - } - - #get classlist - my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); - my $chome = $ENV{"course.$ENV{'request.course.id'}.home"}; - #print "Found $cdom:$cnum:$chome
"; - my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0'); - my $headerclr = '"#ccffff"'; - my $cellclr = '"#ffffcc"'; + my ($request) = shift; + &viewgrades_js($request); - #get list of parts for this problem - my (@parts) = &getpartlist($url); + my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'}); + my $result='

Manual Grading

'; - $request->print("

Manual Grading

"); - - #start the form - $result = '
'."\n". - ''."\n". - ''."\n". - ''."\n". - ''. - "\n".'
'."\n". - ''."\n". - ''."\n"; + $result.='Resource: '.$ENV{'form.url'}.''."\n"; + + #view individual student submission form - called using Javascript viewOneStudent + $result.= ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"; + + #beginning of class grading form + $result.= ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\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.'; + + #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'}); + my %weight = (); + my $ctsparts = 0; + $result.='
UserIdDomain
'; + for (sort keys(%$handgrade)) { + my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_}); + my ($partid,$respid) = split (/_/); + my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb); + $weight{$partid} = $wgt eq '' ? '1' : $wgt; + + $result.=''."\n"; + $result.=''."\n"; + $result.=''."\n"; + $result.= ''."\n"; + $ctsparts++; + } + $result.='
Part '.$partid.'   Point: '; + $result.=''; + my $ctr = 0; + while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across + $result.= '\n"; + $result.=(($ctr+1)%10 == 0 ? '' : ''); + $ctr++; + } + $result.='
'.$ctr."
'; + $result.= '		 or /'. + $weight{$partid}.' (problem weight)
'; + $result.='    '; +# $result.=''."\n"; + $result.= ''."\n"; + + #table listing all the students in a section/class + #header of table + $result.= '
'."\n". + ''. + ''."\n"; + my (@parts) = sort(&getpartlist($url)); foreach my $part (@parts) { - my $display = &Apache::lonnet::metadata($url,$part.'.display'); - if (!$display) { - $display = &Apache::lonnet::metadata($url,$part.'.name'); } - $result .= ''."\n"; + my $display=&Apache::lonnet::metadata($url,$part.'.display'); + next if ($display =~ /^Number of Attempts/); + if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } + if ($display =~ /^Partial Credit Factor/) { + $_ = $display; + my ($partid) = /.*?(\d+).*/; + $result.=''."\n"; + next; + } + $display =~ s/Problem Status/Grade Status
/; + $result.=''."\n"; } - $result .= ""; + $result.=''; #get info for each student - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { - $result .= &viewstudentgrade($url,$symb,$ENV{'request.course.id'}, - $student,@parts); + #list all the students - with points and grade status + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0'); + my $ctr = 0; + foreach (sort {$$fullname{$a} cmp $$fullname{$b} } keys %$fullname) { + my ($uname,$udom) = split(/:/); + $result.=''."\n"; + $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'}, + $_,$$fullname{$_},\@parts,\%weight); + $ctr++; } - $result .= '
FullnameUsernameDomain'.$display.'Score Part '.$partid.'
(weight = '. + $weight{$partid}.')		'.$display.'
'; + $result.='
'; + $result.=''."\n"; + $result.=''; + $result.=&show_grading_menu_form($symb,$url); return $result; } -# ================================================================= Edit grades +#--- call by previous routine to display each student +sub viewstudentgrade { + my ($url,$symb,$courseid,$student,$fullname,$parts,$weight) = @_; + my ($uname,$udom) = split(/:/,$student); + my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname); + my $result=''. + ''.$fullname.''. + ''.$uname.''.$udom.''."\n"; + foreach my $part (@$parts) { + my ($temp,$part,$type)=split(/_/,$part); + my $score=$record{"resource.$part.$type"}; + next if $type eq 'tries'; + if ($type eq 'awarded') { + my $pts = $score eq '' ? '' : $score*$$weight{$part}; + $result.=''."\n"; + $result.=''."\n"; + } elsif ($type eq 'solved') { + my ($status,$foo)=split(/_/,$score,2); + $status = 'nothing' if ($status eq ''); + $result.=''."\n"; + $result.='\n"; + } + } + $result.=''; + return $result; +} + +#--- change scores for all the students in a section/class +# record does not get update if unchanged sub editgrades { my ($request) = @_; - my $result=''; - my $symb = $ENV{'form.symb'}; - if ($symb eq '') { - $request->print("Unable to handle ambiguous references:$symb:". - $ENV{'form.url'}); - return ''; + my $symb=$ENV{'form.symb'}; + my $url =$ENV{'form.url'}; + my $title='

Current Grade Status

'; + $title.='Resource: '.$ENV{'form.url'}.'
'."\n"; + $title.='Section: '.$ENV{'form.section'}.''."\n"; + $title.= &show_grading_menu_form ($symb,$url); + my $result= '
'."\n"; + $result.= ''. + ''."\n"; + + my %scoreptr = ( + 'correct' =>'correct_by_override', + 'incorrect'=>'incorrect_by_override', + 'excused' =>'excused', + 'ungraded' =>'ungraded_attempted', + 'nothing' => '', + ); + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0'); + + my (@partid); + my %weight = (); + my ($i,$ctr,$count,$rec_update) = (0,0,0,0); + while ($ctr < $ENV{'form.totalparts'}) { + my $partid = $ENV{'form.partid_'.$ctr}; + push @partid,$partid; + $weight{$partid} = $ENV{'form.weight_'.$partid}; + $ctr++; + $result .= ''; } - my $url = $ENV{'form.url'}; - #get classlist - my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); - my $chome = $ENV{"course.$ENV{'request.course.id'}.home"}; - #print "Found $cdom:$cnum:$chome
"; - my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0'); - - #get list of parts for this problem + $result .= ''; + foreach (@partid) { + $result .= ''. + ''; + } + $result .= ''."\n"; + + for ($i=0; $i<$ENV{'form.total'}; $i++) { + my $user = $ENV{'form.ctr'.$i}; + my %newrecord; + my $updateflag = 0; + my @userdom = grep /^$user:/,keys %$classlist; + my ($foo,$udom) = split(/:/,$userdom[0]); + + $result .= ''; + + foreach (@partid) { + my $old_aw = $ENV{'form.GD_'.$user.'_'.$_.'_aw_s'}; + my $old_part = $old_aw eq '' ? '' : $old_aw/$weight{$_}; + my $old_score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_sv_s'}}; + + my $awarded = $ENV{'form.GD_'.$user.'_'.$_.'_aw'}; + my $partial = $awarded eq '' ? '' : $awarded/$weight{$_}; + my $score; + if ($partial eq '') { + $score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_sv_s'}}; + } elsif ($partial > 0) { + $score = 'correct_by_override'; + } elsif ($partial == 0) { + $score = 'incorrect_by_override'; + } + $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_sv'} eq 'excused') && + ($score ne 'excused')); + $result .= ''. + ''; + + next if ($old_part eq $partial && $old_score eq $score); + + $updateflag = 1; + $newrecord{'resource.'.$_.'.awarded'} = $partial if $partial ne ''; + $newrecord{'resource.'.$_.'.solved'} = $score; + $rec_update++; + } + $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 .= '
UsernameFullnamePart '.$partid. + ' (Weight = '.$weight{$partid}.')
 Old Score  New Score 
'.$user.' '. + $$fullname{$userdom[0]}.' '.$old_aw.' '.$awarded. + ($score eq 'excused' ? $score : '').' 
'."\n"; + my $msg = 'Number of records updated = '.$rec_update. + ' for '.$count.' student'.($count <= 1 ? '' : 's').'.
'. + 'Total number of students = '.$ENV{'form.total'}.'
'; + return $title.$msg.$result; +} +#------------- end of section for handling grading by section/class --------- +# +#---------------------------------------------------------------------------- + + +#---------------------------------------------------------------------------- +# +#-------------------------- Next few routines handles grading by csv upload +# +#--- Javascript to handle csv upload +sub csvupload_javascript_reverse_associate { + return(<2) { foundsomething=1; } + } + if (founduname==0 || founddomain==0) { + alert('You need to specify at both the username and domain'); + return; + } + if (foundsomething==0) { + alert('You need to specify at least one grading field'); + return; + } + vf.submit(); + } + function flip(vf,tf) { + var nw=eval('vf.f'+tf+'.selectedIndex'); + var i; + //can not pick the same destination field twice + for (i=0;i<=vf.nfields.value;i++) { + if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + } +ENDPICK +} + +sub csvuploadmap_header { + my ($request,$symb,$url,$datatoken,$distotal)= @_; + my $result; + my $javascript; + if ($ENV{'form.upfile_associate'} eq 'reverse') { + $javascript=&csvupload_javascript_reverse_associate(); + } else { + $javascript=&csvupload_javascript_forward_associate(); + } + $request->print(< +

Uploading Class Grades for resource $url

+
+

Identify fields

+Total number of records found in file: $distotal
+Enter as many fields as you can. The system will inform you and bring you back +to this page if the data selected is insufficient to run your class.
+ + + + + + + + + + +
+ +ENDPICK +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); +} + +sub csvuploadmap_footer { + my ($request,$i,$keyfields) =@_; + $request->print(< + + +
+ +ENDPICK +} - $result .= '
'."\n". - ''."\n". - ''."\n". - ''. - "\n".''. - '
'."\n"; - - foreach my $student ( sort(@{ $classlist{'allids'} }) ) { - $result .= &setstudentgrade($url,$symb,$ENV{'request.course.id'}, - $student,@parts); +sub csvuploadmap { + my ($request)= @_; + my ($symb,$url)=&get_symb_and_url($request); + if (!$symb) {return '';} + my $datatoken; + if (!$ENV{'form.datatoken'}) { + $datatoken=&Apache::loncommon::upfile_store($request); + } else { + $datatoken=$ENV{'form.datatoken'}; + &Apache::loncommon::load_tmp_file($request); + } + my @records=&Apache::loncommon::upfile_record_sep(); + &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1); + my ($i,$keyfields); + if (@records) { + my @fields=&csvupload_fields($url); + if ($ENV{'form.upfile_associate'} eq 'reverse') { + &Apache::loncommon::csv_print_samples($request,\@records); + $i=&Apache::loncommon::csv_print_select_table($request,\@records, + \@fields); + foreach (@fields) { $keyfields.=$_->[0].','; } + chop($keyfields); + } else { + unshift(@fields,['none','']); + $i=&Apache::loncommon::csv_samples_select_table($request,\@records, + \@fields); + my %sone=&Apache::loncommon::record_sep($records[0]); + $keyfields=join(',',sort(keys(%sone))); + } } + &csvuploadmap_footer($request,$i,$keyfields); + return ''; +} - $result .= ''. - '
'; +sub csvuploadassign { + my ($request)= @_; + my ($symb,$url)=&get_symb_and_url($request); + if (!$symb) {return '';} + &Apache::loncommon::load_tmp_file($request); + my @gradedata = &Apache::loncommon::upfile_record_sep(); + my @keyfields = split(/\,/,$ENV{'form.keyfields'}); + my %fields=(); + for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) { + if ($ENV{'form.upfile_associate'} eq 'reverse') { + if ($ENV{'form.f'.$i} ne 'none') { + $fields{$keyfields[$i]}=$ENV{'form.f'.$i}; + } + } else { + if ($ENV{'form.f'.$i} ne 'none') { + $fields{$ENV{'form.f'.$i}}=$keyfields[$i]; + } + } + } + $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 ''; +} +#------------- end of section for handling csv file upload --------- +# +#------------------------------------------------------------------- + +#-------------------------- 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"; return $result; } -# ================================================================= Send header -sub send_header { +#--- Displays the main menu page ------- +sub gradingmenu { my ($request) = @_; - $request->print(&Apache::lontexconvert::header()); -# $request->print(" -#"); - $request->print(''); + my ($symb,$url)=&get_symb_and_url($request); + if (!$symb) {return '';} + my $result='

 Select a Grading Method

'; + $result.=''; + $result.=''; + 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.='
Resource: '.$url.'
Part '.(split(/_/))[0].'Type: '.$responsetype.'Handgrade: '.$handgrade.'
'; + $result.=&view_edit_entire_class_form($symb,$url).'
'; + $result.=&upcsvScores_form($symb,$url).'
'; + $result.=&viewGradeaStu_form($symb,$url,$resptype,$hdgrade).'
'; + $result.=&verifyReceipt_form($symb,$url) + if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)); + + return $result; } -# ================================================================= Send footer -sub send_footer { - my ($request) = @_; - $request->print(''); - $request->print(&Apache::lontexconvert::footer()); +#--- Menu for grading a section or the whole class --- +sub view_edit_entire_class_form { + my ($symb,$url)=@_; + my ($classlist,$sections) = &getclasslist('all','0'); + my $result.='
'."\n"; + $result.=''."\n"; + $result.='
'."\n"; + $result.=' View/Grade Entire Section/Class
'."\n"; + $result.='
'."\n". + ''."\n". + ''."\n". + ''."\n"; + $result.=' Select section: '."
\n"; + $result.=' 
'."\n"; + $result.='
'."\n"; + $result.='
'."\n"; + return $result; +} + +#--- Menu to upload a csv scores --- +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; +} + +#--- Handgrading problems --- +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"; + + $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; +} + +#--- Form to input a receipt number --- +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; } -# ===================================================================== Handler sub handler { - my $request = $_[0]; - if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} - else {$Apache::lonxml::debug=0;} + my $request=$_[0]; + if ($ENV{'browser.mathml'}) { $request->content_type('text/xml'); } else { $request->content_type('text/html'); } $request->send_http_header; - return OK if $request->header_only; - my $url = $ENV{'form.url'}; - my $symb = $ENV{'form.symb'}; - my $command = $ENV{'form.command'}; - + return '' if $request->header_only; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); + my $url=$ENV{'form.url'}; + my $symb=$ENV{'form.symb'}; + my $command=$ENV{'form.command'}; + if (!$url) { + my ($temp1,$temp2); + ($temp1,$temp2,$ENV{'form.url'})=split(/___/,$symb); + $url = $ENV{'form.url'}; + } &send_header($request); if ($url eq '' && $symb eq '') { - $request->print("Non-Contextual Access Unsupported:$command:$url:"); + if ($ENV{'user.adv'}) { + if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) && + ($ENV{'form.codethree'})) { + my $token=$ENV{'form.codeone'}.'*'.$ENV{'form.codetwo'}.'*'. + $ENV{'form.codethree'}; + my ($tsymb,$tuname,$tudom,$tcrsid)= + &Apache::lonnet::checkin($token); + if ($tsymb) { + my ($map,$id,$url)=split(/\_\_\_/,$tsymb); + if (&Apache::lonnet::allowed('mgr',$tcrsid)) { + $request->print( + &Apache::lonnet::ssi('/res/'.$url, + ('grade_username' => $tuname, + 'grade_domain' => $tudom, + 'grade_courseid' => $tcrsid, + 'grade_symb' => $tsymb))); + } else { + $request->print('

Not authorized: '.$token.'

'); + } + } else { + $request->print('

Not a valid DocID: '.$token.'

'); + } + } else { + $request->print(&Apache::lonxml::tokeninputfield()); + } + } } else { - $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr', - $ENV{'request.course.id'}); + #&Apache::lonhomework::showhashsubset(\%ENV,'^form'); + $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); if ($command eq 'submission') { - $request->print(&listStudents($request)) - if ($ENV{'form.student'} eq ''); - $request->print(&submission($request)) - if ($ENV{'form.student'} ne ''); + &listStudents($request) if ($ENV{'form.student'} eq ''); + &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') { + $request->print(&verifyreceipt($request)); + } elsif ($command eq 'csvupload') { + $request->print(&csvupload($request)); + } elsif ($command eq 'viewclasslist') { + $request->print(&viewclasslist($request)); + } elsif ($command eq 'csvuploadmap') { + $request->print(&csvuploadmap($request)); + } elsif ($command eq 'csvuploadassign') { + if ($ENV{'form.associate'} ne 'Reverse Association') { + $request->print(&csvuploadassign($request)); + } else { + if ( $ENV{'form.upfile_associate'} ne 'reverse' ) { + $ENV{'form.upfile_associate'} = 'reverse'; + } else { + $ENV{'form.upfile_associate'} = 'forward'; + } + $request->print(&csvuploadmap($request)); + } } else { - $request->print("Unknown action:$command:"); + $request->print("Unknown action: $command:"); } } &send_footer($request); - return OK; + return ''; +} + +sub send_header { + my ($request)= @_; + $request->print(&Apache::lontexconvert::header()); +# $request->print(" +#"); + $request->print(''); +} + +sub send_footer { + my ($request)= @_; + $request->print(''); + $request->print(&Apache::lontexconvert::footer()); } 1; -__END__ +__END__;