--- loncom/homework/grades.pm 2002/07/01 21:20:29 1.34 +++ loncom/homework/grades.pm 2002/07/10 21:08:38 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.34 2002/07/01 21:20:29 ng Exp $ +# $Id: grades.pm,v 1.38 2002/07/10 21:08:38 ng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,7 +30,7 @@ # 7/26 H.K. Ng # 8/20 Gerd Kortemeyer # Year 2002 -# June 2002 H.K. Ng +# June, July 2002 H.K. Ng # package Apache::grades; @@ -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) = @_; @@ -53,6 +55,7 @@ sub moreinfo { if ($ENV{'form.symb'}) { $request->print(''."\n"); } +# $request->print(''."\n"); $request->print(''."\n"); $request->print("Student:".''."
\n"); $request->print("Domain:".''."
\n"); @@ -135,11 +138,15 @@ sub listStudents {  Resource: $ENV{'form.url'}

 View Options
 View Problem: no - yes -   Submissions: last - all + yes
+ Submissions: + last sub only + last sub & parts info + all details + +
@@ -154,7 +161,12 @@ ENDTABLEST } $request->print(''."\n"); + my $t0=&Time::HiRes::time(); + my ($classlist) = &getclasslist($getsec,'0'); + my $t1=&Time::HiRes::time(); + print "getclasslist=",$t1-$t0,"
"; + foreach my $student ( sort(@{ $$classlist{$getsec} }) ) { my ($sname,$sdom) = split(/:/,$student); my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname); @@ -173,6 +185,8 @@ ENDTABLEST $request->print(''); } } + my $t2=&Time::HiRes::time(); + print "processclasslist=",$t2-$t1,"
"; $request->print('
 Select  Username 
'); $request->print(''); } @@ -181,31 +195,39 @@ sub processGroup { my ($request) = shift; my $ctr = 0; my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}} - : ($ENV{'form.stuinfo'}) ); + : ($ENV{'form.stuinfo'})); my $total = scalar(@stuchecked)-1; - foreach my $student (@stuchecked) { - my ($sname,$sdom,$fullname) = split(/:/,$student); + if ($stuchecked[0] eq '') { + &userError($request,'No student was selected for viewing/grading.'); + return; + } + foreach (@stuchecked) { + my ($sname,$sdom,$fullname) = split(/:/); $ENV{'form.student'} = $sname; $ENV{'form.fullname'} = $fullname; &submission($request,$ctr,$total); $ctr++; } - return 'The End'; } +sub userError { + my ($request, $reason, $step) = @_; + $request->print('

LON-CAPA User Error


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

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

'."\n"); + return ''; +} + #FIXME - needs to handle multiple matches sub finduser { my ($name) = @_; my $domain = ''; - if ( $Apache::grades::viewgrades eq 'F' ) { - #get classlist -# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); - #print "Found $cdom:$cnum
"; my ($classlist) = &getclasslist('all','0'); - foreach my $student ( sort(@{ $$classlist{'all'} }) ) { - my ($posname,$posdomain) = split(/:/,$student); + foreach ( sort(@{ $$classlist{'all'} }) ) { + my ($posname,$posdomain) = split(/:/); if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; } } return ($name,$domain); @@ -228,8 +250,9 @@ sub getclasslist { } 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' or $getsec == $section); + push (@{ $classlist{$getsec} }, $student) if ($getsec eq 'all' || $getsec eq $section); } my %seen = (); foreach my $item (@holdsec) { @@ -277,7 +300,7 @@ sub viewstudentgrade { $result.="\n"; } } - $result.=''; + $result.=''; return $result; } @@ -326,10 +349,6 @@ sub setstudentgrade { } if ( scalar(keys(%newrecord)) > 0 ) { $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; - print "grader=$newrecord{'resource.regrader'}:
records
"; - while (my ($k,$v) = each %newrecord) { - print "k=$k:v=$v:
\n"; - } # &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname); $result.="Stored away ".scalar(keys(%newrecord))." elements.
\n"; @@ -342,130 +361,155 @@ 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; - } - - -JAVASCRIPT -} (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 ''; } + if ($ENV{'form.student'} eq '') { &moreinfo($request,'Need student login id'); return ''; } my ($uname,$udom) = &finduser($ENV{'form.student'}); - if ($uname eq '') { &moreinfo($request,"Unable to find student"); return ''; } + 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' : ''); -# -# header info - if ($counter == 0) { - $request->print('

Submission Record

'); - } -# -# 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.='
'; - $result.='
'; - $result.='Student\'s view of the problem
'.$rendered.'
'; - $result.='Correct answer:
'.$companswer; - $result.='
'; - $result.='

'; - $request->print($result); - } -# -# beginning of form + # 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.='Student\'s view of the problem
'.$rendered.'
'; + $result.='Correct answer:
'.$companswer; + $result.='
'; + $result.='

'; + $request->print($result); + } + + # kwclr is the only variable that is non blank if this has been used 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"); + ' 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:  +List    +Paste Selection to List    +Highlight Attribute

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

')); - my $result.='
Username: '.$uname. - 'Fullname: '. - ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)). + + # Student info + $request->print(($counter == 0 ? '' : '
')); + my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)); + my $result.='
'. + ''."\n"; + $result.=''."\n"; + } + } + $result.='
'; + $result.=''; - $result.='
Username: '.$uname. + 'Fullname: '.$fullname. 'Domain: '.$udom.'
Resource: '.$url.'
'; + if ($ENV{'form.handgrade'} eq 'yes') { +# my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'}); + my ($classlist) = &getclasslist('all','0'); + my @collaborators; +# foreach ( sort(@{ $$classlist{'all'} }) ) { +# my ($sname,$sdom) = split(/:/); +# push @collaborators,$sname if (grep /\b$sname(\b|\.)/i,$subonly); +# } +# push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators. + if (scalar(@collaborators) != 0) { + $result.='
Collaborators: '; + foreach (@collaborators) { + $result.=$_.' ('.&get_fullname($_,$udom).')    '; + } + $result.='
'."\n"; $request->print($result); -# -# print student answer - my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom, - $ENV{'request.course.id'},$last); - $request->print($answer); - $answer =~ m/.*<\/tr>.*?		(.*?)(.*?)<\/td>/; - print "Submitted=$1:
$2;"; -# + + # print student answer + if ($ENV{'form.lastSub'} eq 'lastonly') { + my ($string,$timestamp)=&get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'}); + $string=&keywords_highlight(join('::::',@$string)); + my $lastsubonly='
'; + $lastsubonly.=''; + $lastsubonly.=''; + $lastsubonly.='
Last Submission Only'. + ($timestamp eq '' ? '' : '    Date Submitted: '.@$timestamp).'
'; + $lastsubonly.=$string; + $lastsubonly.='
'."\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')); + } + my $wgt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname); my $wgtmsg = ($wgt > 0 ? '(problem weight)' : 'problem weight assigned by computer'); $wgt = ($wgt > 0 ? $wgt : '1'); my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); my $score = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt); -# -# display grading options + # display grading options $result=''. ''."\n"; + $result.=''."\n"; + $result.=''."\n"; $result.='
Points'; - my $ctr = 0; + my $ctr = 0; $result.=''; # display radio buttons in a nice table with 10 across while ($ctr<=$wgt) { $result.= '\n"; + $result.="  \n"; } } - $result.='
'; foreach my $part (&getpartlist($url)) { + print "parts=$part
"; my ($temp,$part,$type)=split(/_/,$part); if ($type eq 'solved') { my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2); @@ -497,13 +542,16 @@ JAVASCRIPT ''."\n"; $optsel =~ s/
'; + $result.='Compose Message
'."\n"; +# $result.='
'; + $result.='
'; $request->print($result); -# -# print end of form + + # print end of form if ($counter == $total) { my $endform.='
'; my $ntstu ='
'; $request->print($endform); } + return ''; } +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)) { + print "lasthash key=$_
"; + if ($_ =~ /\.submission$/) {push @string, $_,$lasthash{$_}} + if ($_ =~ /timestamp/) {push @timestamp, scalar(localtime($lasthash{$_}))}; +# if ($_ =~ /\.submission$/) {$string = $lasthash{$_}} +# if ($_ =~ /timestamp/) {$timestamp=scalar(localtime($lasthash{$_}))}; + } + } + @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string; + return \@string,\@timestamp; + } +} + +sub keywords_highlight { + my $string = shift; + my $size = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'}; + my $styleon = $ENV{'form.kwstyle'} eq '' ? '' : $ENV{'form.kwstyle'}; + (my $styleoff = $styleon) =~ s/\$styleon$_$styleoff\<\/font\>/gi; + } + return $string; +} + sub processHandGrade { my ($request) = shift; my $url = $ENV{'form.url'}; @@ -529,35 +617,83 @@ sub processHandGrade { my $button = $ENV{'form.gradeOpt'}; my $ngrade = $ENV{'form.NCT'}; my $ntstu = $ENV{'form.NTSTU'}; -# my $vProb = $ENV{'form.vProb'}; -# my $lastSub= $ENV{'form.lastSub'}; + + my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'}; + my %keyhash = (); + $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g; + $keyhash{$symb.'_handgrade'} = 'activated'; + $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'}; + + 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'}); my (@parts) = sort(&getpartlist($url)); if ($button eq 'Save & Next') { my $ctr = 0; - while ($ctr < $ENV{'form.NCT'}) { -# my $pts = ($ENV{'form.GRADE_BOX'.$ctr} ne '' ? $ENV{'form.GRADE_BOX'.$ctr} : $ENV{'form.RADVAL'.$ctr}); -# my $wgt = $ENV{'form.WGT'.$ctr}; -# my $sel = $ENV{'form.GRADE_SEL'.$ctr}; -# my $score = $pts/$wgt if ($wgt != 0); + while ($ctr < $ngrade) { my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr}); &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts); -# &saveHandGrade($url,$symb,$uname,$udom,$score,@parts); + + my $includemsg = $ENV{'form.includemsg'.$ctr}; + my ($subject,$message,$msgstatus) = ('','',''); + if ($includemsg =~ /savemsg|new$ctr/) { + $subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/); + my (@msgnum) = split(/,/,$includemsg); + foreach (@msgnum) { + $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne ''); + } + $message =~ s/\s+/ /g; + $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,$ENV{'form.msgsub'},$message); + } + if ($ENV{'form.collaborator'.$ctr}) { + my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr}); + foreach (@collaborators) { + &saveHandGrade($url,$symb,$_,$udom,$ctr,@parts); + if ($message ne '') { + $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,$ENV{'form.msgsub'},$message); + } + } + } $ctr++; } } my $firststu = $ENV{'form.unamedom0'}; my $laststu = $ENV{'form.unamedom'.($ngrade-1)}; - #get classlist -# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); - my ($classlist) = &getclasslist('all','0'); - + my ($classlist) = &getclasslist($ENV{'form.section'},'0'); my (@nextlist,@prevlist); my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0); - foreach my $student ( sort(@{ $$classlist{'all'} }) ) { + foreach my $student ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) { my ($uname,$udom) = split(/:/,$student); + my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname); + next if ($status eq 'nothing' && $ENV{'form.submitonly'} eq 'yes'); + if ($nextflg == 1 && $button =~ /Next$/) { push @nextlist,$uname if ($ctr < $ntstu); $ctr++; @@ -588,13 +724,18 @@ sub processHandGrade { &submission($request,$ctr,$total); $ctr++; } - - return 'The End'; + 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 ''; } sub saveHandGrade { my ($url,$symb,$stuname,$domain,$newflg,@parts) = @_; -# my ($stuname,$domain) = split(/:/,$student); my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname); my %newrecord; @@ -603,7 +744,8 @@ sub saveHandGrade { my $oldscore=$record{"resource.$part.$type"}; my $newscore; if ($type eq 'awarded' && $newflg >= 0) { - my $pts = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ? $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg}); + my $pts = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ? + $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg}); my $wgt = $ENV{'form.WGT'.$newflg}; # my $sel = $ENV{'form.GRADE_SEL'.$newflg}; $newscore = $pts/$wgt if ($wgt != 0); @@ -633,10 +775,10 @@ sub saveHandGrade { } if ( scalar(keys(%newrecord)) > 0 ) { $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; - while (my ($k,$v) = each %newrecord) { - print "k=$k:v=$v:
\n"; - } - print "symb=$symb,courseid=$ENV{'request.course.id'},dom=$domain,name=$stuname
"; +# while (my ($k,$v) = each %newrecord) { +# print "k=$k:v=$v:
\n"; +# } +# print "symb=$symb,courseid=$ENV{'request.course.id'},dom=$domain,name=$stuname
"; # &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname); } return ''; @@ -665,14 +807,36 @@ sub gradingmenu { my ($request) = @_; my ($symb,$url)=&get_symb_and_url($request); if (!$symb) {return '';} + my $allkeys = &Apache::lonnet::metadata($url,'keys'); + my $handgrade = ($allkeys =~ /parameter_.*?_handgrade/ ? 'yes' : 'no'); + my ($responsetype,$foo) = split(/_/,&Apache::lonnet::metadata($url,'packages')); + $allkeys=~s/,/\/g; +# print "allkeys=$allkeys

"; + $Apache::lonxml::debug=1; + &Apache::lonxml::debug(join(':',&Apache::lonnet::metadata($url,'packages'))); + $Apache::lonxml::debug=0; my $result='

 Select a Grading Method

'; - $result.=' Resource: '.$url.'

'; - + $result.=''; + $result.=''. + ''; + $result.=''. + ''; + $result.='
Resource: '.$url.'
Type: '.$responsetype.'  Handgrade: '.$handgrade.'
'; + my $t0=&Time::HiRes::time(); $result.=&view_edit_entire_class_form($symb,$url).'
'; + my $t1=&Time::HiRes::time(); + print "elapsed10=",$t1-$t0,"
"; $result.=&upcsvScores_form($symb,$url).'
'; - $result.=&viewGradeaStu_form($symb,$url).'
'; + my $t2=&Time::HiRes::time(); + print "elapsed21=",$t2-$t1,"
"; + $result.=&viewGradeaStu_form($symb,$url,$responsetype,$handgrade).'
'; + my $t3=&Time::HiRes::time(); + print "elapsed32=",$t3-$t2,"
"; $result.=&verifyReceipt_form($symb,$url); + my $t4=&Time::HiRes::time(); + print "elapsed43=",$t4-$t3,"
"; + print "Total elapsed time=",$t4-$t0,"
"; return $result; } @@ -718,8 +882,17 @@ ENDUPFORM } sub viewGradeaStu_form { - my ($symb,$url) = @_; + my ($symb,$url,$response,$handgrade) = @_; + + + my $t3=&Time::HiRes::time(); + my ($classlist,$sections) = &getclasslist('all','0'); + + my $t4=&Time::HiRes::time(); + print "elapsed_getclasslist=",$t4-$t3,"
"; + + my $result.='
'."\n"; $result.=''."\n"; @@ -727,7 +900,9 @@ sub viewGradeaStu_form { $result.=''."\n". ''."\n". ''."\n". - ''."\n"; + ''."\n". + ''."\n". + ''."\n"; $result.=' Select section: submitted'. ' everybody
'; - $result.=' (Section -1 implies the students were not assigned a section.)
' if (grep /-1/,@$sections); + $result.=' (Section "no" implies the students were not assigned a section.)
' + if (grep /no/,@$sections); $result.='
 '."\n". ''."\n"; @@ -783,8 +959,8 @@ sub viewgrades { my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'}); #print "Found $cdom:$cnum
"; my ($classlist) = &getclasslist('all','0'); - my $headerclr = '"#ccffff"'; - my $cellclr = '"#ffffcc"'; + my $headerclr = '"#ddffff"'; + my $cellclr = '"#ffffdd"'; #get list of parts for this problem my (@parts) = sort(&getpartlist($url)); @@ -799,7 +975,7 @@ sub viewgrades { ''."\n". '
'."\n"; $result.=' View/Grade an Individual Student\'s Submission
'."\n". ''."\n". - ''."\n"; + ''."\n"; foreach my $part (@parts) { my $display=&Apache::lonnet::metadata($url,$part.'.display'); if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); } @@ -808,7 +984,7 @@ sub viewgrades { $result.=''; #get info for each student foreach my $student ( sort(@{ $$classlist{'all'} }) ) { - my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts); +# my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts); # print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:
\n"; $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts); } @@ -839,7 +1015,7 @@ sub editgrades { ''."\n". '
'."\n"; - foreach my $student ( sort(@{ $$classlist{'all '} }) ) { + foreach my $student ( sort(@{ $$classlist{'all'} }) ) { $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts); } @@ -847,6 +1023,289 @@ sub editgrades { return $result; } +sub sub_page_js { + my $request = shift; + $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? Edit if desired.",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; + var rtrchk = eval("document.SCORE.includemsg"+usrctr); + var msgchk = rtrchk.value; +// alert("checked=>"+msgchk); + re = /msgsub/; + var shwsel = ""; + if (re.test(msgchk)) { shwsel = "checked" } + displaySubject(subject,shwsel); + for (var i=1; i<=Nmsg; i++) { + var testpt = "savemsg"+i+","; + re = /testpt/; + shwsel = ""; + if (re.test(msgchk)) { shwsel = "checked" } + var message = eval("document.SCORE.savemsg"+i+".value"); + displaySavedMsg(i,message,shwsel); + } + newmsg = eval("document.SCORE.newmsg"+usrctr+".value"); + shwsel = ""; + re = /newmsg/; + if (re.test(msgchk)) { shwsel = "checked" } + newMsg(newmsg,shwsel); + msgTail(); + return; + } + + function savedMsgHeader(Nmsg,usrctr,fullname) { + var height = 30*Nmsg+250; + var scrollbar = "no"; + if (height > 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 +} + sub csvupload_javascript_reverse_associate { return(<
UsernameNameDomain
UsernameFullnameDomain