--- loncom/homework/grades.pm 2002/07/07 20:08:45 1.36 +++ loncom/homework/grades.pm 2002/07/19 20:42:18 1.40 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.36 2002/07/07 20:08:45 ng Exp $ +# $Id: grades.pm,v 1.40 2002/07/19 20:42:18 ng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,9 @@ use Apache::lonxml; use Apache::lonnet; use Apache::loncommon; use Apache::lonhomework; +use Apache::lonmsg qw(:user_normal_msg); use Apache::Constants qw(:common); +#use Time::HiRes qw( gettimeofday tv_interval ); sub moreinfo { my ($request,$reason) = @_; @@ -94,26 +96,23 @@ sub verifyreceipt { } sub student_gradeStatus { - my ($url,$udom,$uname) = @_; - my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))); - my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); - foreach my $part (&getpartlist($url)) { - my ($temp,$part,$type)=split(/_/,$part); - if ($type eq 'solved') { - my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2); - $status = 'partial' if ($foo =~ /^partially/); + my ($url,$udom,$uname,$partlist) = @_; + my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))); + my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); + my %partstatus = (); + foreach (@$partlist) { + my ($status,$foo)=split(/_/,$record{"resource.$_.solved"},2); $status = 'nothing' if ($status eq ''); - return $type,$status; - } - } - return ''; + $partstatus{$_} = $status; + } + return %partstatus; } sub get_fullname { - my ($sname,$sdom) = @_; + my ($uname,$udom) = @_; my %name=&Apache::lonnet::get('environment', ['lastname','generation', 'firstname','middlename'], - $sdom,$sname); + $udom,$uname); my $fullname; my ($tmp) = keys(%name); if ($tmp !~ /^(con_lost|error|no_such_host)/i) { @@ -124,6 +123,25 @@ sub get_fullname { return $fullname; } +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{1,2}.*/) { + 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; +} + + sub listStudents { my ($request) = shift; my $cdom =$ENV{"course.$ENV{'request.course.id'}.domain"}; @@ -131,23 +149,33 @@ sub listStudents { my $getsec =$ENV{'form.section'}; my $submitonly=$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{$_}); + $result.=''. + ''. + ''; + } + $result.='
Resource: '.$ENV{'form.url'}.'
Part id: '.$_.'Type: '.$responsetype.'Handgrade: '.$handgrade.'
'; + $request->print($result); + $request->print(< View Submissions for a Student or a Group of Students - Resource: $ENV{'form.url'}

-
 View Options
+  View Problem: no - yes -   Submissions: last - all - - - - -\n"; + my $result="\n"; foreach my $part (@parts) { my ($temp,$part,$type)=split(/_/,$part); my $score=$record{"resource.$part.$type"}; @@ -282,14 +328,14 @@ sub viewstudentgrade { my ($status,$foo)=split(/_/,$score,2); $result.="\n"; } } - $result.=''; + $result.=''; return $result; } @@ -322,7 +368,7 @@ sub setstudentgrade { 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 ($newscore eq 'partial') { $newscore = 'correct_partially_by_override'; } } else { #$result.="$stuname:$part:$type:unchanged $oldscore to $newscore:
\n"; } @@ -350,271 +396,6 @@ sub setstudentgrade { sub submission { my ($request,$counter,$total) = @_; - if ($counter == 0) { - $request->print(< - function updateRadio(radioButton,formtextbox,formsel,wgt) { - var pts = formtextbox.value; - var resetbox =false; - if (isNaN(pts) || pts < 0) { - alert("A number equal or greater than 0 is expected. Entered value = "+pts); - for (var i=0; i 0 && pts < wgt) { - formsel[4].selected = true; - } - if (pts == wgt) { - formsel[0].selected = true; - } - return; - } - - function keywords(keyform) { - var keywds = keyform.value; - var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keywds); - if (nret==null) return; - keyform.value = nret; - return; - } - -//===================== Script to add keyword(s) ================== - function getSel() { - if (document.getSelection) txt = document.getSelection(); - else if (document.selection) txt = document.selection.createRange().text; - else return; - var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," "); - if (cleantxt=="") { - alert("Select a word or group of words from document and then click this link."); - return; - } - var nret = prompt("Add selection to keyword list?",cleantxt); - if (nret==null) return; - var curlist = document.SCORE.keywords.value; - document.SCORE.keywords.value = curlist+" "+nret; - return; - } - -//====================== Script for composing message ============== - function msgCenter(msgform,usrctr,fullname) { - var Nmsg = msgform.savemsgN.value; - savedMsgHeader(Nmsg,usrctr,fullname); - var subject = msgform.msgsub.value; - displaySubject(subject); - for (var i=1; i<=Nmsg; i++) { - var message = eval("document.SCORE.savemsg"+i+".value"); - displaySavedMsg(i,message); - } - newmsg = eval("document.SCORE.newmsg"+usrctr+".value"); - newMsg(newmsg); - msgTail(); - return; - } - -function savedMsgHeader(Nmsg,usrctr,fullname) { - var height = 30*Nmsg+250; - var scrollbar = "no"; - if (height > 600) { - height = 600; - scrollbar = "yes"; - } - pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',width=600,height='+height); - pWin.document.write(""); - pWin.document.write("Message Central"); - - pWin.document.write(" -SUBJAVASCRIPT -} (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) = &finduser($ENV{'form.student'}); @@ -623,174 +404,228 @@ SUBJAVASCRIPT 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 + + # 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' && $counter == 0) { - my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom, - $ENV{'request.course.id'}); - my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom, - $ENV{'request.course.id'}); - my $result.='
- - - - + yes
+ Submissions: + handgrade only + last sub only + last sub & parts info + all details + + + + + ENDTABLEST if ($ENV{'form.url'}) { $request->print(''."\n"); @@ -157,23 +185,38 @@ ENDTABLEST } $request->print(''."\n"); - my ($classlist) = &getclasslist($getsec,'0'); - foreach my $student ( sort(@{ $$classlist{$getsec} }) ) { - my ($sname,$sdom) = split(/:/,$student); - my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname); - next if ($status eq 'nothing' && $submitonly eq 'yes'); + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($getsec,'0'); + + $result='
 Select  Username  Fullname  Domain  Grade Status 
'. + ''. + ''. + ''; + foreach (sort(@$partlist)) { + $result.=''; + } + $request->print($result.''."\n"); + + foreach my $student (sort(@{ $$classlist{$getsec} }) ) { + my ($uname,$udom) = split(/:/,$student); + my (%status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname,$partlist); + my $statusflg = ''; + foreach (keys(%status)) { + $statusflg = 1 if ($status{$_} ne 'nothing'); + } + next if ($statusflg eq '' && $submitonly eq 'yes'); - my $fullname = &get_fullname($sname,$sdom); if ( $Apache::grades::viewgrades eq 'F' ) { - $request->print("\n".''. - ''."\n". - ''."\n". - ''."\n". - ''."\n"); - $request->print(''."\n"); + $result=''. + ''."\n". + ''."\n". + ''."\n". + ''."\n"; - $request->print(''); + foreach (sort keys(%status)) { + $result.=''."\n"; + } + $request->print($result.''."\n"); } } $request->print('
 Select  Username  Fullname  Domain  Part ID '.$_.' Status 
 '.$sname.'  '.$fullname.'  '.$sdom.'  '.$status.' 
 '.$uname.'  '.$$fullname{$student}.'  '.$udom.' 
 '.$status{$_}.' 
'); @@ -191,13 +234,13 @@ sub processGroup { return; } foreach (@stuchecked) { - my ($sname,$sdom,$fullname) = split(/:/); - $ENV{'form.student'} = $sname; + my ($uname,$udom,$fullname) = split(/:/); + $ENV{'form.student'} = $uname; $ENV{'form.fullname'} = $fullname; &submission($request,$ctr,$total); $ctr++; } - return 'The End'; + return ''; } sub userError { @@ -226,28 +269,32 @@ sub finduser { } 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); + my ($getsec,$hideexpired) = @_; + my %classlist=&Apache::lonnet::dump('classlist', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my $now = time; + 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); } sub getpartlist { @@ -264,14 +311,13 @@ sub getpartlist { 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.="
$username$fullname$domain
$username$fullname$domain
'; - $result.='
'; - $result.='Student\'s view of the problem
'.$rendered.'
'; - $result.='Correct answer:
'.$companswer; - $result.='
'; - $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'}); + # 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.='Student\'s view of the problem
'.$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". - ''."\n". - ''."\n". - ''."\n". - ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". ''."\n"); + ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n"); + + my ($cts,$prnmsg) = (1,''); + while ($cts <= $ENV{'form.savemsgN'}) { + $prnmsg.=''."\n"; + $cts++; + } + $request->print($prnmsg); if ($ENV{'form.handgrade'} eq 'yes') { $request->print(<Keyword Options  -Keyword List    + Keyword Options:  +List    Paste Selection to Keyword list (requires N4+ and IE5+)    -Keyword Highlight Attribute

+ CLASS="page">Paste Selection to List    +Highlight Attribute

KEYWORDS } } -# -# Student info - $request->print(($counter == 0 ? '' : '

')); + # Student info + $request->print(($counter == 0 ? '' : '
')); my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)); - my $result.=''; + my $result='
Username: '.$uname. - 'Fullname: '.$fullname. -# ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)). - 'Domain: '.$udom.'
'. + '
'; + + $result.=''; if ($ENV{'form.handgrade'} eq 'yes') { - my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'}); - my ($classlist) = &getclasslist('all','0'); +# my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'}); +# my ($classlist) = &getclasslist('all','0'); + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist('all','0'); my @collaborators; - foreach ( sort(@{ $$classlist{'all'} }) ) { - my ($sname,$sdom) = split(/:/); - push @collaborators,$sname if (grep /\b$sname(\b|\.)/i,$subonly); - } - push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators. +# foreach ( sort(@{ $$classlist{'all'} }) ) { +# my ($uname,$udom) = split(/:/); +# push @collaborators,$uname if (grep /\b$uname(\b|\.)/i,$subonly); +# } +# push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators. if (scalar(@collaborators) != 0) { - $result.=''."\n"; $result.=''."\n"; } } - $result.='
Fullname: '.$fullname. + '   Username: '.$uname. + '   Domain: '.$udom.'
Collaborators: '; + $result.='
Collaborators: '; foreach (@collaborators) { - $result.=$_.' ('.&get_fullname($_,$udom).')    '; + $result.=$_.' ('.$$fullname{$_.':'.$udom}.')    '; +# $result.=$_.' ('.&get_fullname($_,$udom).')    '; } $result.='
'."\n"; - $request->print($result); -# -# print student answer - $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, - $ENV{'request.course.id'},$last, - '.submission','Apache::grades::keywords_highlight')); -# -# - my $wgt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname); - my $wgtmsg = ($wgt > 0 ? '(problem weight)' : 'problem weight assigned by computer'); - $wgt = ($wgt > 0 ? $wgt : '1'); - my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); - my $score = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt); + $request->print($result.'
'."\n"); -# -# display grading options - $result=''. - ''."\n"; - $result.=''."\n". - $result.=''."\n". - $result.=''; - $result.=''."\n"; - $result.=''."\n"; - } + my %seen = (); + my @partlist; + my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); +# while (my ($k,$v) = each (%record)){ +# print "key=$k ==> value=$v
"; +# } + 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); + + # display grading options + $result=''; + $result.='
Points'; - my $ctr = 0; - - $result.=''; # display radio buttons in a nice table with 10 across - while ($ctr<=$wgt) { - $result.= '\n"; - $result.=(($ctr+1)%10 == 0 ? '' : ''); - $ctr++; + my ($partlist,$handgrade) = &response_type($url); + + # print student answer + if ($ENV{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) { + my ($string,$timestamp)=&get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'}); + my $lastsubonly.=''; + if ($$timestamp eq '') { + $lastsubonly.=''; + } else { + for my $part (sort keys(%$handgrade)) { + foreach (@$string) { + my ($partid,$respid) = /^resource\.(\d{1,2})\.(\d{1,2})\.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.='
'.$ctr."
Last Submission Only'. + ($$timestamp eq '' ? '' : '    Date Submitted: '.$$timestamp).'
'.$$string[0].'
Part ID '. + $partid.' Response ID '.$respid. + ' Submission '.&keywords_highlight($subval).'
'."\n"; + $request->print($lastsubonly); + } else { + $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, + $ENV{'request.course.id'},$last, + '.submission','Apache::grades::keywords_highlight')); } - $result.='
'; - $result.='		 or /'.$wgt.' '.$wgtmsg.' '; + $result=''."\n". + ''."\n". + ''."\n"; + $result.=' Compose Message
'."\n" if ($ENV{'form.handgrade'} eq 'yes'); + $request->print($result); - foreach my $part (&getpartlist($url)) { - my ($temp,$part,$type)=split(/_/,$part); - if ($type eq 'solved') { - my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2); - $status = 'partial' if ($foo =~ /partially/); - $status = 'nothing' if ($status eq ''); - $result.='  \n"; - $result.='Compose Message
'; + $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++; + } + $result.='
'.$ctr."
'; + + $result.='		 or /'.$wgt.' '.$wgtmsg.' '; + + $result.=''."  \n"; + $result.=''; + $result.='
'; + $request->print($result); } - $result.='
'; - $request->print($result); -# -# print end of form + $request->print(''."\n"); + $request->print(''."\n"); + + # print end of form if ($counter == $total) { my $endform.='
'; my $ntstu =''."\n"; + ''. + ''."\n"; my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1'); - $ntstu =~ s/
'; + $ntstu =~ s/