--- loncom/homework/grades.pm 2002/07/10 21:08:38 1.38 +++ loncom/homework/grades.pm 2002/07/18 21:27:57 1.39 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.38 2002/07/10 21:08:38 ng Exp $ +# $Id: grades.pm,v 1.39 2002/07/18 21:27:57 ng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,7 +42,7 @@ 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 ); +#use Time::HiRes qw( gettimeofday tv_interval ); sub moreinfo { my ($request,$reason) = @_; @@ -96,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) { @@ -126,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"}; @@ -133,25 +149,32 @@ 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 sub only - last sub & parts info - all details - - - - -\n"; + my $result="\n"; foreach my $part (@parts) { my ($temp,$part,$type)=split(/_/,$part); my $score=$record{"resource.$part.$type"}; @@ -293,7 +327,7 @@ sub viewstudentgrade { my ($status,$foo)=split(/_/,$score,2); $result.="
- - - - + last sub only + last sub & parts info + all details + + + + + ENDTABLEST if ($ENV{'form.url'}) { $request->print(''."\n"); @@ -161,32 +184,40 @@ ENDTABLEST } $request->print(''."\n"); - my $t0=&Time::HiRes::time(); + my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($getsec,'0'); - 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); - next if ($status eq 'nothing' && $submitonly eq 'yes'); + $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"); } } - my $t2=&Time::HiRes::time(); - print "processclasslist=",$t2-$t1,"
"; $request->print('
 Select  Username  Fullname  Domain  Part ID '.$_.' Status 
 '.$sname.'  '.$fullname.'  '.$sdom.'  '.$status.' 
 '.$uname.'  '.$$fullname{$student}.'  '.$udom.' 
 '.$status{$_}.' 
'); $request->print(''); } @@ -202,13 +233,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 { @@ -237,28 +268,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 { @@ -275,14 +310,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'."\n". + ''."\n". ''."\n". ''."\n". ''."\n". @@ -453,16 +488,16 @@ KEYWORDS my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)); my $result.='
'. '
'; - $result.=''; + $result.='
Username: '.$uname. - 'Fullname: '.$fullname. - 'Domain: '.$udom.'
'; 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); +# 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) { @@ -478,16 +513,30 @@ KEYWORDS $result.='
Fullname: '.$fullname. + '   Username: '.$uname. + '   Domain: '.$udom.'
'."\n"; $request->print($result); + my ($partlist,$handgrade) = &response_type($url); + # 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.=''; + 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.=''; + } + } + } + } $lastsubonly.='
Last Submission Only'. - ($timestamp eq '' ? '' : '    Date Submitted: '.@$timestamp).'
'; - $lastsubonly.=$string; + ($$timestamp eq '' ? '' : '    Date Submitted: '.$$timestamp).'
'.$$string[0].'
Part ID '. + $partid.' Response ID '.$respid. + ' Submission '.&keywords_highlight($subval).'
'."\n"; $request->print($lastsubonly); } else { @@ -496,60 +545,67 @@ KEYWORDS '.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 - $result=''. + $result=''."\n". + ''."\n". ''."\n"; - $result.=''."\n"; - $result.=''."\n"; - $result.=''; - $result.=''."\n"; - $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++; - } - $result.='
'.$ctr."
'; + $result.=' Compose Message
'."\n" if ($ENV{'form.handgrade'} eq 'yes'); + $request->print($result); - $result.='		 or /'.$wgt.' '.$wgtmsg.' '; + 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 %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); + my $score = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt); - 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); - $status = 'partial' if ($foo =~ /partially/); - $status = 'nothing' if ($status eq ''); - $result.='  \n"; - } + # display grading options + $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++; + } + $result.='
'.$ctr."
'; + + $result.='		 or /'.$wgt.' '.$wgtmsg.' '; + + $result.=''."  \n"; + $result.=''; + $result.='
'; + $request->print($result); } - $result.='Compose Message
'."\n"; -# $result.='
'; - $result.='
'; - $request->print($result); + $request->print(''."\n"); + $request->print(''."\n"); # print end of form if ($counter == $total) { @@ -574,26 +630,23 @@ KEYWORDS 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.':'.$_}; + 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; + foreach ((keys %lasthash)) { + if ($_ =~ /\.submission$/) {push @string, (join(':',$_,$lasthash{$_}))} + if ($_ =~ /timestamp/) {$timestamp = scalar(localtime($lasthash{$_}))}; + } + } + @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string; + return \@string,\$timestamp; } } @@ -604,7 +657,6 @@ sub keywords_highlight { (my $styleoff = $styleon) =~ s/\$styleon$_$styleoff\<\/font\>/gi; } return $string; @@ -621,7 +673,7 @@ sub processHandGrade { my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'}; my %keyhash = (); $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g; - $keyhash{$symb.'_handgrade'} = 'activated'; + $ENV{'form.keywords'} =~ s/^\s+|\s+$//; $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'}; $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'}; $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'}; @@ -652,13 +704,22 @@ sub processHandGrade { $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - my (@parts) = sort(&getpartlist($url)); + if ($ENV{'form.refresh'} eq 'on') { + my $ctr = 0; + while ($ctr < $ntstu) { + ($ENV{'form.student'},my $udom) = split(/:/,$ENV{'form.unamedom'.$ctr}); + &submission($request,$ctr,$ntstu-1); + $ctr++; + } + return ''; + } if ($button eq 'Save & Next') { my $ctr = 0; while ($ctr < $ngrade) { my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr}); - &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts); + my ($errorflg) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr); + return '' if ($errorflg eq 'error'); my $includemsg = $ENV{'form.includemsg'.$ctr}; my ($subject,$message,$msgstatus) = ('','',''); @@ -674,7 +735,7 @@ sub processHandGrade { if ($ENV{'form.collaborator'.$ctr}) { my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr}); foreach (@collaborators) { - &saveHandGrade($url,$symb,$_,$udom,$ctr,@parts); + &saveHandGrade($request,$url,$symb,$_,$udom,$ctr); if ($message ne '') { $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,$ENV{'form.msgsub'},$message); } @@ -688,23 +749,30 @@ sub processHandGrade { my ($classlist) = &getclasslist($ENV{'form.section'},'0'); my (@nextlist,@prevlist); - my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0); + my ($nextflg,$ctr,$ctprev) = (0,0,0); + my ($partlist,$handgrade) = &response_type($ENV{'form.url'}); 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'); + 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 '' && $ENV{'form.submitonly'} eq 'yes'); if ($nextflg == 1 && $button =~ /Next$/) { push @nextlist,$uname if ($ctr < $ntstu); $ctr++; + last if ($ctr == $ntstu); } $nextflg = 1 if ($student eq $laststu); - $prevflg = 1 if ($student eq $firststu); - if ($prevflg == 0 && $button eq 'Previous') { + if ($button eq 'Previous') { + last if ($student eq $firststu); push @prevlist,$uname; $ctprev++; } } + if ($button eq 'Previous') { if ($ctprev <= $ntstu) { @nextlist = @prevlist; @@ -717,6 +785,7 @@ sub processHandGrade { } } } + $ctr = 0; my $total = scalar(@nextlist)-1; foreach my $student (@nextlist) { @@ -735,50 +804,35 @@ sub processHandGrade { } sub saveHandGrade { - my ($url,$symb,$stuname,$domain,$newflg,@parts) = @_; - my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname); + my ($request,$url,$symb,$stuname,$domain,$newflg) = @_; +# my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname); my %newrecord; - - foreach my $part (@parts) { - my ($temp,$part,$type)=split(/_/,$part); - my $oldscore=$record{"resource.$part.$type"}; - my $newscore; - if ($type eq 'awarded' && $newflg >= 0) { - my $pts = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ? - $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg}); - my $wgt = $ENV{'form.WGT'.$newflg}; -# my $sel = $ENV{'form.GRADE_SEL'.$newflg}; - $newscore = $pts/$wgt if ($wgt != 0); - } - if ($type eq 'solved') { - $newscore = $ENV{'form.GRADE_SEL'.$newflg} if ($newflg >= 0); - my $update=0; - if ($newscore eq 'nothing' ) { - if ($oldscore ne '') { - $update=1; - $newscore = ''; - } - } elsif ($oldscore !~ m/^$newscore/) { - $update=1; - if ($newscore eq 'correct') { $newscore = 'correct_by_override'; } - if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; } - if ($newscore eq 'excused') { $newscore = 'excused'; } - if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; } - if ($newscore eq 'partial') { $newscore = 'correct_partially_by_override'; } - } - if ($update) { $newrecord{"resource.$part.$type"}=$newscore; } - } else { - if ($oldscore ne $newscore) { - $newrecord{"resource.$part.$type"}=$newscore; + foreach (split(/:/,$ENV{'form.partlist'.$newflg})) { + if ($ENV{'form.GRADE_SEL'.$newflg.'_'.$_} eq 'excused') { + $newrecord{'resource.'.$_.'.solved'} = 'excused'; + } else { + my $pts = ($ENV{'form.GRADE_BOX'.$newflg.'_'.$_} ne '' ? + $ENV{'form.GRADE_BOX'.$newflg.'_'.$_} : $ENV{'form.RADVAL'.$newflg.'_'.$_}); + if ($pts eq '') { + &userError($request,'No point was assigned for part id '.$_.' 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 ($partial == 0) { + $newrecord{'resource.'.$_.'.solved'} = 'incorrect_by_override'; + } else { + $newrecord{'resource.'.$_.'.solved'} = 'correct_by_override'; + } } - } } + 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"; + } # &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname); } return ''; @@ -807,39 +861,70 @@ 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.=''; - $result.=''. - ''; - $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.'
Type: '.$responsetype.'  Handgrade: '.$handgrade.'
Resource: '.$url.'
Part id: '.$_.'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).'
'; - 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,"
"; + $result.=&viewGradeaStu_form($symb,$url,$resptype,$hdgrade).'
'; + $result.=&verifyReceipt_form($symb,$url).'
'; + $result.=&view_classlist_form($symb,$url); + + return $result; +} + +sub view_classlist_form { + my ($symb,$url)=@_; + my $result.='
'."\n"; + $result.=''."\n"; + $result.='
'."\n"; + $result.=' View Class List
'."\n"; + $result.=''."\n". + ''."\n". + ''."\n". + ''."\n"; + $result.=' '."\n"; + $result.='
'."\n"; + $result.='
'."\n"; return $result; } +sub viewclasslist { + my ($request) = shift; + my ($coursedomain,$coursenum) = split(/_/,$ENV{'request.course.id'}); + my %classlist=&Apache::lonnet::dump('classlist',$coursedomain,$coursenum); + $request->print(''); + foreach (sort keys(%classlist)) { +# my ($unam,$udom) = split(/:/,$_,2); +# my $section = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'}); +# my $fullname = &get_fullname ($unam,$udom); +# my @uname; +# $uname[0]=$unam; +# my %userid=&Apache::lonnet::idrget($udom,@uname); +# my $value=$classlist{$_}.':'.$userid{$unam}.':'.$section.':'.$fullname; +# $classlist{$_}=$value; + $request->print(''); + } + $request->print('
'.$_.' 
 '.$classlist{$_}.'
'); +# my $putresult = &Apache::lonnet::put +# ('classlist',\%classlist, +# $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, +# $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + + return ''; +} + sub view_edit_entire_class_form { my ($symb,$url)=@_; my $result.='
'."\n"; @@ -883,16 +968,7 @@ ENDUPFORM sub viewGradeaStu_form { 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"; @@ -905,8 +981,8 @@ sub viewGradeaStu_form { ''."\n"; $result.=' Select section:'."\n"; $result.='  Display students who has: '. @@ -1027,7 +1103,7 @@ sub sub_page_js { my $request = shift; $request->print(< - function updateRadio(radioButton,formtextbox,formsel,wgt) { + function updateRadio(radioButton,formtextbox,formsel,scores) { var pts = formtextbox.value; var resetbox =false; if (isNaN(pts) || pts < 0) { @@ -1050,28 +1126,37 @@ sub sub_page_js { radioButton[i].checked=true; } } - updateSelect(formsel,pts,wgt); + updateSelect(formsel); + scores.value = "0"; } - function writeBox(formrad,formsel,pts,wgt) { + function writeBox(formrad,formsel,pts,scores) { formrad.value = pts; - updateSelect(formsel,pts,wgt); + scores.value = "0"; + updateSelect(formsel,pts); return; } - function updateSelect(formsel,pts,wgt) { - if (pts == 0) { - formsel[1].selected = true; - } - if (pts > 0 && pts < wgt) { - formsel[4].selected = true; + function clearRadBox(radioButton,formbox,formsel,scores) { + for (var i=0; i"); pWin.document.write(""); pWin.document.write(""); - pWin.document.write(""); + pWin.document.write(""); } function msgTail() { @@ -1252,10 +1337,14 @@ function displaySavedMsg(ctr,msg,shwsel) hwdWin.document.write("Highlight Central"); hwdWin.document.write("
'."\n"; $result.=' View/Grade an Individual Student\'s Submission
New