loncom/homework/grades.pm - diff

Return to grades.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.40 and 1.57

-version 1.40, 2002/07/19 20:42:18
+version 1.57, 2002/10/17 14:35:34
  Line 30
  # 7/26 H.K. Ng
  # 8/20 Gerd Kortemeyer
  # Year 2002
- # June, July 2002 H.K. Ng
+ # June-August H.K. Ng
  #
  package Apache::grades;
  Line 40  use Apache::lonxml;
  use Apache::lonnet;
  use Apache::loncommon;
  use Apache::lonhomework;
+ use Apache::loncoursedata;
  use Apache::lonmsg qw(:user_normal_msg);
  use Apache::Constants qw(:common);
- #use Time::HiRes qw( gettimeofday tv_interval );
- sub moreinfo {
+ # ----- These first few routines are general use routines.-----
-   my ($request,$reason) = @_;
+ #
-   $request->print("Unable to process request: $reason");
+ # --- Retrieve the parts that matches stores_\d+ from the metadata file.---
-   if ( $Apache::grades::viewgrades eq 'F' ) {
+ sub getpartlist {
-     $request->print('<form action="/adm/grades" method="post">'."\n");
+     my ($url) = @_;
-     if ($ENV{'form.url'}) {
+     my @parts =();
-       $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
+     my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
-     }
+     foreach my $key (@metakeys) {
-     if ($ENV{'form.symb'}) {
+ 	if ( $key =~ m/stores_(\w+)_.*/) {
-       $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
+ 	    push(@parts,$key);
-     }
+ 	}
- #    $request->print('<input type="hidden" name="command" value="submission" />'."\n");
-     $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
-     $request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'" />'."<br />\n");
-     $request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");
-     $request->print('<input type="submit" name="submit" value="ReSubmit" />'."<br />\n");
-     $request->print('</form>');
-   }
-   return '';
- }
- sub verifyreceipt {
-     my $request=shift;
-     my $courseid=$ENV{'request.course.id'};
- #    my $cdom=$ENV{"course.$courseid.domain"};
- #    my $cnum=$ENV{"course.$courseid.num"};
-     my $receipt=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
-                 $ENV{'form.receipt'};
-     $receipt=~s/[^\-\d]//g;
-     my $symb=$ENV{'form.symb'};
-     unless ($symb) {
- 	$symb=&Apache::lonnet::symbread($ENV{'form.url'});
-     }
-     if ((&Apache::lonnet::allowed('mgr',$courseid)) && ($symb)) {
-         $request->print('<h1>Verifying Submission Receipt '.$receipt.'</h1>');
-         my $matches=0;
-         my ($classlist) = &getclasslist('all','0');
-         foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
-             my ($uname,$udom)=split(/\:/,$student);
-             if ($receipt eq
-              &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {
-                $request->print('Matching '.$student.'<br>');
-                $matches++;
- 	   }
-         }
-         $request->printf('<p>'.$matches." match%s</p>",$matches <= 1 ? '' : 'es');
- # needs to print who is matched
      }
-     return '';
+     return @parts;
  }
- sub student_gradeStatus {
+ # --- Get the symbolic name of a problem and the url
-    my ($url,$udom,$uname,$partlist) = @_;
+ sub get_symb_and_url {
-    my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
+     my ($request) = @_;
-    my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+     (my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-    my %partstatus = ();
+     my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
-    foreach (@$partlist) {
+     if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
-       my ($status,$foo)=split(/_/,$record{"resource.$_.solved"},2);
+     return ($symb,$url);
-       $status = 'nothing' if ($status eq '');
-       $partstatus{$_} = $status;
-    }
-    return %partstatus;
  }
+ # --- 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);
+                                   $udom,$uname);
      my $fullname;
      my ($tmp) = keys(%name);
      if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- 	$fullname=$name{'lastname'}.$name{'generation'};
+         $fullname = &Apache::loncoursedata::ProcessFullName
- 	if ($fullname =~ /[^\s]+/) { $fullname.=', '; }
+             (@name{qw/lastname generation firstname middlename/});
- 	$fullname.=$name{'firstname'}.' '.$name{'middlename'};
+     } else {
+         &Apache::lonnet::logthis('grades.pm: no name data for '.$uname.
+                                  '@'.$udom.':'.$tmp);
      }
      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 ($url) = shift;
-    my $allkeys = &Apache::lonnet::metadata($url,'keys');
+     my $allkeys = &Apache::lonnet::metadata($url,'keys');
-    my %seen = ();
+     my %seen = ();
-    my (@partlist,%handgrade);
+     my (@partlist,%handgrade);
-    foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
+     foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
-       if (/^\w+response_\d{1,2}.*/) {
+ 	if (/^\w+response_\w+.*/) {
- 	 my ($responsetype,$part) = split(/_/,$_,2);
+ 	    my ($responsetype,$part) = split(/_/,$_,2);
- 	 my ($partid,$respid) = split(/_/,$part);
+ 	    my ($partid,$respid) = split(/_/,$part);
- 	 $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
+ 	    $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
- 	 next if ($seen{$partid} > 0);
+ 	    next if ($seen{$partid} > 0);
- 	 $seen{$partid}++;
+ 	    $seen{$partid}++;
- 	 push @partlist,$partid;
+ 	    push @partlist,$partid;
-       }
+ 	}
-    }
+     }
-    return \@partlist,\%handgrade;
+     return \@partlist,\%handgrade;
- }
- sub listStudents {
-   my ($request) = shift;
-   my $cdom      =$ENV{"course.$ENV{'request.course.id'}.domain"};
-   my $cnum      =$ENV{"course.$ENV{'request.course.id'}.num"};
-   my $getsec    =$ENV{'form.section'};
-   my $submitonly=$ENV{'form.submitonly'};
-   my $result='<h2><font color="#339933">&nbsp;View Submissions for a Student or a Group of Students</font></h2>';
-   $result.='<table border="0">';
-   $result.='<tr><td colspan=3><font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font></td></tr>';
-   my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
-   for (sort keys(%$handgrade)) {
-       my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
-       $result.='<tr><td><b>Part id: </b>'.$_.'</td>'.
- 	  '<td><b>Type: </b>'.$responsetype.'</td>'.
- 	  '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
-   }
-   $result.='</table>';
-   $request->print($result);
-   $request->print(<<ENDTABLEST);
- <form action="/adm/grades" method="post">
- &nbsp;<b>View Problem: </b><input type="radio" name="vProb" value="no" checked> no
- <input type="radio" name="vProb" value="yes"> yes <br />
- &nbsp;<b>Submissions: </b>
- <input type="radio" name="lastSub" value="hdgrade" checked /> handgrade only
- <input type="radio" name="lastSub" value="lastonly" /> last sub only
- <input type="radio" name="lastSub" value="last" /> last sub & parts info
- <input type="radio" name="lastSub" value="all" /> all details
- <input type="hidden" name="section" value="$getsec" />
- <input type="hidden" name="submitonly" value="$submitonly" />
- <input type="hidden" name="response" value="$ENV{'form.response'}" />
- <input type="hidden" name="handgrade" value="$ENV{'form.handgrade'}" />
- <input type="submit" name="submit" value="View/Grade" />
- ENDTABLEST
-   if ($ENV{'form.url'}) {
-       $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
-   }
-   if ($ENV{'form.symb'}) {
-       $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
-   }
-   $request->print('<input type="hidden" name="command" value="processGroup" />'."\n");
-   my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($getsec,'0');
-   $result='<table border="0"><tr><td bgcolor="#777777">'.
-       '<table border="0"><tr bgcolor="#e6ffff">'.
-       '<td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Username&nbsp;</b></td>'.
-       '<td><b>&nbsp;Fullname&nbsp;</b></td><td><b>&nbsp;Domain&nbsp;</b></td>';
-   foreach (sort(@$partlist)) {
-       $result.='<td><b>&nbsp;Part ID '.$_.' Status&nbsp;</b></td>';
-   }
-   $request->print($result.'</tr>'."\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');
-       if ( $Apache::grades::viewgrades eq 'F' ) {
- 	  $result='<tr bgcolor="#ffffe6">'.
- 	      '<td align="center"><input type=checkbox name="stuinfo" value="'.
- 	      $student.':'.$$fullname{$student}.'"></td>'."\n".
- 	      '<td>&nbsp;'.$uname.'&nbsp;</td>'."\n".
- 	      '<td>&nbsp;'.$$fullname{$student}.'&nbsp;</td>'."\n".
- 	      '<td align="middle">&nbsp;'.$udom.'&nbsp;</td>'."\n";
- 	  foreach (sort keys(%status)) {
- 	      $result.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
- 	  }
- 	  $request->print($result.'</tr>'."\n");
-       }
-   }
-   $request->print('</table></td></tr></table>');
-   $request->print('<input type="submit" name="submit" value="View/Grade" /><form />');
- }
- 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.fullname'} = $fullname;
-       &submission($request,$ctr,$total);
-       $ctr++;
-   }
-   return '';
- }
- sub userError {
-     my ($request, $reason, $step) = @_;
-     $request->print('<h3><font color="red">LON-CAPA User Error</font></h3><br />'."\n");
-     $request->print('<b>Reason: </b>'.$reason.'<br /><br />'."\n");
-     $request->print('<b>Step: </b>'.($step ne '' ? $step : 'Use your browser back button to correct')
- 		    .'<br /><br />'."\n");
-     return '';
- }
- #FIXME - needs to handle multiple matches
- sub finduser {
-   my ($name) = @_;
-   my $domain = '';
-   if ( $Apache::grades::viewgrades eq 'F' ) {
-     my ($classlist) = &getclasslist('all','0');
-     foreach ( sort(@{ $$classlist{'all'} }) ) {
-       my ($posname,$posdomain) = split(/:/);
-       if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
-     }
-     return ($name,$domain);
-   } else {
-     return ($ENV{'user.name'},$ENV{'user.domain'});
-   }
  }
+ #--- Dumps the class list with usernames,list of sections,
+ #--- section, ids and fullnames for each user.
  sub getclasslist {
-    my ($getsec,$hideexpired) = @_;
+     my ($getsec,$hideexpired) = @_;
-    my %classlist=&Apache::lonnet::dump('classlist',
+     my $classlist=&Apache::loncoursedata::get_classlist();
- 				       $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+     # Bail out if we were unable to get the classlist
- 				       $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+     return if (! defined($classlist));
-    my $now = time;
+     #
-    my (@holdsec,@sections,%allids,%stusec,%fullname);
+     my %sections;
-    foreach (keys(%classlist)) {
+     my %fullnames;
-        my ($end,$start,$id,$section,$fullname)=split(/:/,$classlist{$_});
+     foreach (keys(%$classlist)) {
-        # still a student?
+         # the following undefs are for 'domain', and 'username' respectively.
-        if (($hideexpired) && ($end) && ($end < $now)) {
+ 	my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
- 	   next;
+             @{$classlist->{$_}};
-        }
+ 	# still a student?
-        $section = ($section ne '' ? $section : 'no');
+ 	if (($hideexpired) && ($status ne 'Active')) {
-        push @holdsec,$section;
+             delete ($classlist->{$_});
-        if ($getsec eq 'all' || $getsec eq $section) {
+             next;
- 	   push (@{ $classlist{$getsec} }, $_);
+         }
- 	   $allids{$_}=$id;
+ 	$section = ($section ne '' ? $section : 'no');
- 	   $stusec{$_}=$section;
+ 	if ($getsec eq 'all' || $getsec eq $section) {
- 	   $fullname{$_}=$fullname;
+             $sections{$section}++;
-        }
+             $fullnames{$_}=$fullname;
-    }
+         } else {
-    my %seen = ();
+             delete($classlist->{$_});
-    foreach my $item (@holdsec) {
+         }
-        push (@sections, $item) unless $seen{$item}++;
-    }
-    return (\%classlist,\@sections,\%allids,\%stusec,\%fullname);
- }
- 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);
      }
-   }
+     my %seen = ();
-   return @parts;
+     my @sections = sort(keys(%sections));
+     return ($classlist,\@sections,\%fullnames);
  }
- sub viewstudentgrade {
+ #find user domain
-   my ($url,$symb,$courseid,$student,@parts) = @_;
+ sub finduser {
-   my $cellclr = '"#ffffdd"';
+     my ($name) = @_;
-   my ($username,$domain) = split(/:/,$student);
+     my $domain = '';
+     if ( $Apache::grades::viewgrades eq 'F' ) {
-   my $fullname = &get_fullname($username,$domain);
+ 	my %classlist=&Apache::lonnet::dump('classlist',
-   my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username);
+ 					    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ 					    $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-   my $result="<tr bgcolor=$cellclr><td>$username</td><td>$fullname</td><td align=\"middle\">$domain</td>\n";
+ 	my (@fields) = grep /^$name:/, keys %classlist;
-   foreach my $part (@parts) {
+ 	($name, $domain) = split(/:/,$fields[0]);
-     my ($temp,$part,$type)=split(/_/,$part);
+ 	return ($name,$domain);
-     my $score=$record{"resource.$part.$type"};
+     } else {
-     if ($type eq 'awarded' || $type eq 'tries') {
+ 	return ($ENV{'user.name'},$ENV{'user.domain'});
-       $result.='<td align="middle"><input type="text" name="GRADE.'.$student.'.'.$part.'.'.$type.
- 	  '" value="'.$score.'" size="4" /></td>'."\n";
-     } elsif ($type eq 'solved') {
-       my ($status,$foo)=split(/_/,$score,2);
-       $result.="<td align=\"middle\"><select name=\"GRADE.$student.$part.$type\">\n";
-       my $optsel = '<option>correct</option><option>incorrect</option><option>excused</option>'.
- 	  '<option>ungraded</option><option>nothing</option>'."\n";
-       $status = 'nothing' if ($status eq '');
-       $optsel =~ s/<option>$status/<option selected="on">$status/;
-       $result.=$optsel;
-       $result.="</select></td>\n";
      }
-   }
-   $result.='</td></tr>';
-   return $result;
  }
- #FIXME need to look at the metadata <stores> spec on what type of data to accept and provide an
+ #--- Prompts a user to enter a username.
- #interface based on that, also do that to above function.
+ sub moreinfo {
- sub setstudentgrade {
+     my ($request,$reason) = @_;
-   my ($url,$symb,$courseid,$student,@parts) = @_;
+     $request->print("Unable to process request: $reason");
-   print "set student grade parts=@parts<br>";
+     if ( $Apache::grades::viewgrades eq 'F' ) {
-   my $result ='';
+ 	$request->print('<form action="/adm/grades" method="post">'."\n");
-   my ($stuname,$domain) = split(/:/,$student);
+ 	if ($ENV{'form.url'}) {
-   my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
+ 	    $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
-   my %newrecord;
+ 	}
+ 	if ($ENV{'form.symb'}) {
-   foreach my $part (@parts) {
+ 	    $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
-     my ($temp,$part,$type)=split(/_/,$part);
+ 	}
-     my $oldscore=$record{"resource.$part.$type"};
+ 	$request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
-     my $newscore=$ENV{"form.GRADE.$student.$part.$type"};
+ 	$request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'" />'."<br />\n");
-     print "old=$oldscore:new=$newscore:<br>";
+ 	$request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");
-     if ($type eq 'solved') {
+ 	$request->print('<input type="submit" name="submit" value="ReSubmit" />'."<br />\n");
-       my $update=0;
+ 	$request->print('</form>');
-       if ($newscore eq 'nothing' ) {
- 	if ($oldscore ne '') {
- 	  $update=1;
- 	  $newscore = '';
- 	}
-       } elsif ($oldscore !~ m/^$newscore/) {
- 	$update=1;
- 	$result.="Updating $stuname to $newscore<br />\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'; }
- #	if ($newscore eq 'partial')   { $newscore = 'correct_partially_by_override'; }
-       } else {
- 	#$result.="$stuname:$part:$type:unchanged  $oldscore to $newscore:<br />\n";
-       }
-       if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }
-     } else {
-       if ($oldscore ne $newscore) {
- 	$newrecord{"resource.$part.$type"}=$newscore;
- 	$result.="Updating $student"."'s status for $part.$type to $newscore<br />\n";
-       } else {
- 	#$result.="$stuname:$part:$type:unchanged  $oldscore to $newscore:<br />\n";
-       }
      }
-   }
+     return '';
-   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.<br />\n";
-   }
-   return $result;
  }
- #
+ #--- Retrieve the grade status of a student for all the parts
- # --------------------------- show submissions of a student, option to grade --------
+ sub student_gradeStatus {
- sub submission {
+     my ($url,$symb,$udom,$uname,$partlist) = @_;
-   my ($request,$counter,$total) = @_;
+     my %record     = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+     my %partstatus = ();
-   (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+     foreach (@$partlist) {
-   if ($ENV{'form.student'} eq '') { &moreinfo($request,'Need student login id'); return ''; }
+ 	my ($status,$foo)    = split(/_/,$record{"resource.$_.solved"},2);
-   my ($uname,$udom) = &finduser($ENV{'form.student'});
+ 	$status              = 'nothing' if ($status eq '');
-   if ($uname eq '') { &moreinfo($request,'Unable to find student'); return ''; }
+ 	$partstatus{$_}      = $status;
+ 	my $subkey           = "resource.$_.submitted_by";
-   my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
+ 	$partstatus{$subkey} = $record{$subkey} if ($record{$subkey} ne '');
-   if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
+     }
-   my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+     return %partstatus;
+ }
-   # header info
-   if ($counter == 0) {
+ # hidden form and javascript that calls the form
-       &sub_page_js($request);
+ # Use by verifyscript and viewgrades
-       $request->print('<h2>&nbsp;<font color="#339933">Submission Record</font></h2>'.
+ # Shows a student's view of problem and submission
- 		      '<font size=+1>&nbsp;<b>Resource: </b>'.$url.'</font>');
+ sub jscriptNform {
+     my ($url,$symb) = @_;
-       # option to display problem, only once else it cause problems with the form later
+     my $jscript='<script type="text/javascript" language="javascript">'."\n".
-       # since the problem has a form.
+ 	'    function viewOneStudent(user,domain) {'."\n".
-       if ($ENV{'form.vProb'} eq 'yes') {
+ 	'	document.onestudent.student.value = user;'."\n".
- 	  my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+ 	'	document.onestudent.userdom.value = domain;'."\n".
- 							    $ENV{'request.course.id'});
+ 	'	document.onestudent.submit();'."\n".
- 	  my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+ 	'    }'."\n".
- 								 $ENV{'request.course.id'});
+ 	'</script>'."\n";
- 	  my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
+     $jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".
- 	  $result.='<table border="0" width="100%"><tr><td bgcolor="#e6ffff">';
+ 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
- 	  $result.='<b>Student\'s view of the problem</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />';
+ 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
- 	  $result.='<b>Correct answer:</b><br />'.$companswer;
+ 	'<input type="hidden" name="command" value="submission" />'."\n".
- 	  $result.='</td></tr></table>';
+ 	'<input type="hidden" name="student" value="" />'."\n".
- 	  $result.='</td></tr></table><br />';
+ 	'<input type="hidden" name="userdom" value="" />'."\n".
- 	  $request->print($result);
+ 	'</form>'."\n";
-       }
+     return $jscript;
-       # 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('<form action="/adm/grades" method="post" name="SCORE">'."\n".
- 		      '<input type="hidden" name="command"    value="handgrade" />'."\n".
- 		      '<input type="hidden" name="refresh"    value="off" />'."\n".
- 		      '<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
- 		      '<input type="hidden" name="url"        value="'.$url.'" />'."\n".
- 		      '<input type="hidden" name="vProb"      value="'.$ENV{'form.vProb'}.'" />'."\n".
- 		      '<input type="hidden" name="lastSub"    value="'.$ENV{'form.lastSub'}.'" />'."\n".
- 		      '<input type="hidden" name="section"    value="'.$ENV{'form.section'}.'">'."\n".
- 		      '<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
- 		      '<input type="hidden" name="response"   value="'.$ENV{'form.response'}.'">'."\n".
- 		      '<input type="hidden" name="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\n".
- 		      '<input type="hidden" name="keywords"   value="'.$ENV{'form.keywords'}.'" />'."\n".
- 		      '<input type="hidden" name="kwclr"      value="'.$ENV{'form.kwclr'}.'" />'."\n".
- 		      '<input type="hidden" name="kwsize"     value="'.$ENV{'form.kwsize'}.'" />'."\n".
- 		      '<input type="hidden" name="kwstyle"    value="'.$ENV{'form.kwstyle'}.'" />'."\n".
- 		      '<input type="hidden" name="msgsub"     value="'.$ENV{'form.msgsub'}.'" />'."\n".
- 		      '<input type="hidden" name="savemsgN"   value="'.$ENV{'form.savemsgN'}.'" />'."\n".
- 		      '<input type="hidden" name="NCT"'.
- 		      ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
-       my ($cts,$prnmsg) = (1,'');
-       while ($cts <= $ENV{'form.savemsgN'}) {
- 	  $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
- 	      ($keyhash{$symb.'_savemsg'.$cts} eq '' ? $ENV{'form.savemsg'.$cts} : $keyhash{$symb.'_savemsg'.$cts}).
- 	      '" />'."\n";
- 	  $cts++;
-       }
-       $request->print($prnmsg);
-       if ($ENV{'form.handgrade'} eq 'yes') {
- 	  $request->print(<<KEYWORDS);
- &nbsp;<b>Keyword Options:</b>&nbsp;
- <a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>List</a>&nbsp; &nbsp;
- <a href="#" onMouseDown="javascript:getSel(); return false"
-  CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
- <a href="javascript:kwhighlight()"; TARGET=_self>Highlight Attribute</a><br /><br />
- KEYWORDS
-       }
-   }
-   # Student info
-   $request->print(($counter == 0 ? '' : '<br />'));
-   my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom));
-   my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'.
-       '<table border="0" width=100%><tr bgcolor="#ffffff"><td>';
-   $result.='<table border="0"><tr bgcolor="#ffffff"><td><b>Fullname: </b>'.$fullname.
-       '</td><td>&nbsp; &nbsp;<b>Username: </b>'.$uname.
- 	      '</td><td>&nbsp; &nbsp;<b>Domain: </b>'.$udom.'</td></tr>';
-   if ($ENV{'form.handgrade'} eq 'yes') {
- #      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 ($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.='<tr bgcolor="#ffffff"><td colspan=3><b>Collaborators: </b>';
- 	  foreach (@collaborators) {
- 	      $result.=$_.' ('.$$fullname{$_.':'.$udom}.') &nbsp; &nbsp;';
- #	      $result.=$_.' ('.&get_fullname($_,$udom).') &nbsp; &nbsp;';
- 	  }
- 	  $result.='</td></tr>'."\n";
- 	  $result.='<input type="hidden" name="collaborator'.$counter.
- 	      '" value="'.(join ':',@collaborators).'" />'."\n";
-       }
-   }
-   $request->print($result.'</table>'."\n");
-   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.='</td></tr><tr><td bgcolor="#e6ffff"><b>Last Submission Only</b>'.
- 	  ($$timestamp eq '' ? '' : '&nbsp; &nbsp; <b>Date Submitted:</b> '.$$timestamp).'</td></tr>';
-       if ($$timestamp eq '') {
- 	  $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0].'</td></tr>';
-       } 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.='<tr><td bgcolor="#ffffe6"><b>Part ID</b> '.
- 			  $partid.' <b>Response ID</b> '.$respid.
- 			  ' <b>Submission</b> '.&keywords_highlight($subval).'</td></tr>'
- 			  if ($ENV{'form.lastSub'} eq 'lastonly' ||
- 			      ($ENV{'form.lastSub'} eq 'hdgrade' && $$handgrade{$part} =~ /:yes$/));
- 		  }
- 	      }
- 	  }
-       }
-       $lastsubonly.='</td></tr><tr><td bgcolor="#ffffff">'."\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='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
-       '<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
-       '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'.$udom.'" />'."\n";
-   $result.='&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
-       ',\''.$fullname.'\')"; TARGET=_self>Compose Message</a><br />'."\n" if ($ENV{'form.handgrade'} eq 'yes');
-   $request->print($result);
-   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<br>";
- #  }
-   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)' : '<font color="red">problem weight assigned by computer</font>');
-       $wgt       = ($wgt > 0 ? $wgt : '1');
-       my $score  = ($record{'resource.'.$partid.'.awarded'} eq '' ? '' : $record{'resource.'.$partid.'.awarded'}*$wgt);
-       # display grading options
-       $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />';
-       $result.='<table border="0"><tr><td><b>Part </b>'.$partid.' <b>Points</b></td><td>';
-       my $ctr = 0;
-       $result.='<table border="0"><tr>';  # display radio buttons in a nice table 10 across
-       while ($ctr<=$wgt) {
- 	  $result.= '<td><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
- 	      'onclick="javascript:writeBox(this.form.GRADE_BOX'.$counter.'_'.$partid.
- 	      ',this.form.GRADE_SEL'.$counter.'_'.$partid.','.$ctr.
- 	      ',this.form.stores'.$counter.'_'.$partid.')" '.
- 	      ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
- 	  $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
- 	  $ctr++;
-       }
-       $result.='</tr></table>';
-       $result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>';
-       $result.='<td><input type="text" name="GRADE_BOX'.$counter.'_'.$partid.'"'.
- 	  ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
- 	  'onChange="javascript:updateRadio(this.form.RADVAL'.$counter.'_'.$partid.
- 	  ',this.form.GRADE_BOX'.$counter.'_'.$partid.
- 	  ',this.form.GRADE_SEL'.$counter.'_'.$partid.
- 	  ',this.form.stores'.$counter.'_'.$partid.')" /></td>'."\n";
-       $result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
-       $result.='<select name="GRADE_SEL'.$counter.'_'.$partid.'" '.
- 	  'onChange="javascript:clearRadBox(this.form.RADVAL'.$counter.'_'.$partid.
- 	  ',this.form.GRADE_BOX'.$counter.'_'.$partid.
- 	  ',this.form.GRADE_SEL'.$counter.'_'.$partid.
- 	  ',this.form.stores'.$counter.'_'.$partid.')" />'."\n".
- 	  '<option selected="on"> </option>'.
- 	  '<option>excused</option></select>'."&nbsp&nbsp\n";
-       $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="0" />';
-       $result.='</td></tr></table>';
-       $request->print($result);
-   }
-   $request->print('<input type="hidden" name="partlist'.$counter.'" value="'.(join ":",@partlist).'" />'."\n");
-   $request->print('</td></tr></table></td></tr></table>'."\n");
-   # print end of form
-   if ($counter == $total) {
-       my $endform.='<table border="0"><tr><td><input type="submit" name="gradeOpt" value="Save & Next" />';
-       my $ntstu ='<select name="NTSTU">'.
- 	  '<option>1</option><option>2</option>'.
- 	  '<option>3</option><option>5</option>'.
- 	  '<option>7</option><option>10</option></select>'."\n";
-       my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
-       $ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
-       $endform.=$ntstu.'student(s) &nbsp;&nbsp;'.
- 	  '<input type="submit" name="gradeOpt" value="Next" />&nbsp'.
- 	  '<input type="submit" name="gradeOpt" value="Previous" />&nbsp'.
- 	  '(Next and Previous do not save the scores.)'.
- 	  '</td><tr></table></form>';
-       $request->print($endform);
-   }
-   return '';
  }
- sub get_last_submission {
+ #------------------ End of general use routines --------------------
-   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$/) {push @string, (join(':',$_,$lasthash{$_}))}
- 	      if ($_ =~ /timestamp/) {$timestamp = scalar(localtime($lasthash{$_}))};
- 	  }
-       }
-       @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
-       return \@string,\$timestamp;
-   }
- }
- sub keywords_highlight {
+ #------------------------------------ Receipt Verification Routines
-   my $string  = shift;
+ #
-   my $size    = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'};
+ #--- Check whether a receipt number is valid.---
-   my $styleon = $ENV{'form.kwstyle'} eq ''  ? '' : $ENV{'form.kwstyle'};
+ sub verifyreceipt {
-   (my $styleoff = $styleon) =~ s/\</\<\//;
+     my $request  = shift;
-   my @keylist = split(/[,\s+]/,$ENV{'form.keywords'});
-   foreach (@keylist) {
-       $string =~ s/\b$_(\b|\.)/\<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff\<\/font\>/gi;
-   }
-   return $string;
- }
- sub processHandGrade {
+     my $courseid = $ENV{'request.course.id'};
-   my ($request) = shift;
+     my $receipt  = unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
-   my $url    = $ENV{'form.url'};
+ 	$ENV{'form.receipt'};
-   my $symb   = $ENV{'form.symb'};
+     $receipt     =~ s/[^\-\d]//g;
-   my $button = $ENV{'form.gradeOpt'};
+     my $url      = $ENV{'form.url'};
-   my $ngrade = $ENV{'form.NCT'};
+     my $symb     = $ENV{'form.symb'};
-   my $ntstu  = $ENV{'form.NTSTU'};
+     unless ($symb) {
+ 	$symb    = &Apache::lonnet::symbread($url);
-   my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+     }
-   my %keyhash = ();
-   $ENV{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
-   $ENV{'form.keywords'}           =~ s/^\s+|\s+$//;
-   $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'});
-   if ($ENV{'form.refresh'} eq 'on') {
-       my $ctr = 0;
-       $ENV{'form.NTSTU'}=$ngrade;
-       while ($ctr < $ngrade) {
- 	  ($ENV{'form.student'},my $udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
- 	  &submission($request,$ctr,$ngrade-1);
- 	  $ctr++;
-       }
-       return '';
-   }
-   if ($button eq 'Save & Next') {
+     my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
-       my $ctr = 0;
+ 	$receipt.'</h3></font>'."\n".
-       while ($ctr < $ngrade) {
+ 	'<font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font><br><br>'."\n";
- 	  my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
- 	  my ($errorflg) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
+     my ($string,$contents,$matches) = ('','',0);
- 	  return '' if ($errorflg eq 'error');
+     my (undef,undef,$fullname) = &getclasslist('all','0');
- 	  my $includemsg = $ENV{'form.includemsg'.$ctr};
+     foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
- 	  my ($subject,$message,$msgstatus) = ('','','');
+ 	my ($uname,$udom)=split(/\:/);
- 	  if ($includemsg =~ /savemsg|new$ctr/) {
+ 	if ($receipt eq
- 	      $subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/);
+ 	    &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {
- 	      my (@msgnum) = split(/,/,$includemsg);
+ 	    $contents.='<tr bgcolor="#ffffe6"><td>&nbsp;'."\n".
- 	      foreach (@msgnum) {
+ 		'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
- 		  $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
+ 		'\')"; TARGET=_self>'.$$fullname{$_}.'</a>&nbsp;</td>'."\n".
- 	      }
+ 		'<td>&nbsp;'.$uname.'&nbsp;</td>'.
- 	      $message =~ s/\s+/ /g;
+ 		'<td>&nbsp;'.$udom.'&nbsp;</td></tr>'."\n";
- 	      $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,$ENV{'form.msgsub'},$message);
- 	  }
+ 	    $matches++;
- 	  if ($ENV{'form.collaborator'.$ctr}) {
+ 	}
- 	      my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
+     }
- 	      foreach (@collaborators) {
+     if ($matches == 0) {
- 		  &saveHandGrade($request,$url,$symb,$_,$udom,$ctr);
+ 	$string = $title.'No match found for the above receipt.';
- 		  if ($message ne '') {
+     } else {
- 		      $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,$ENV{'form.msgsub'},$message);
+ 	$string = &jscriptNform($url,$symb).$title.
- 		  }
+ 	    'The above receipt matches the following student'.
- 	      }
+ 	    ($matches <= 1 ? '.' : 's.')."\n".
- 	  }
+ 	    '<table border="0"><tr><td bgcolor="#777777">'."\n".
- 	  $ctr++;
+ 	    '<table border="0"><tr bgcolor="#e6ffff">'."\n".
-       }
+ 	    '<td><b>&nbsp;Fullname&nbsp;</b></td>'."\n".
-   }
+ 	    '<td><b>&nbsp;Username&nbsp;</b></td>'."\n".
-   my $firststu = $ENV{'form.unamedom0'};
+ 	    '<td><b>&nbsp;Domain&nbsp;</b></td></tr>'."\n".
-   my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
+ 	    $contents.
-   $ctr = 2;
+ 	    '</table></td></tr></table>'."\n";
-   while ($laststu eq '') {
+     }
-       $laststu  = $ENV{'form.unamedom'.($ngrade-$ctr)};
+     return $string.&show_grading_menu_form($symb,$url);
-       $ctr++;
+ }
-       $laststu = $firststu if ($ctr > $ngrade);
-   }
+ #--- This is called by a number of programs.
-   my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0');
+ #--- 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 (@parsedlist,@nextlist);
+     my ($symb,$url) = &get_symb_and_url();
-   my ($nextflg) = 0;
+     my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
-   foreach ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) {
+     my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
-       if ($nextflg == 1 && $button =~ /Next$/) {
+     my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
- 	  push @parsedlist,$_;
+     my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};
-       }
-       $nextflg = 1 if ($_ eq $laststu);
+     my $result;
-       if ($button eq 'Previous') {
+     my ($partlist,$handgrade) = &response_type($url);
- 	  last if ($_ eq $firststu);
+     for (sort keys(%$handgrade)) {
- 	  push @parsedlist,$_;
+ 	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
-       }
+ 	$ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes');
-   }
+ 	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
-   $ctr = 0;
+ 	    '<td><b>Type: </b>'.$responsetype.'</td>'.
-   my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
+ 	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
-   @parsedlist = reverse @parsedlist if ($button eq 'Previous');
+     }
-   foreach my $student (@parsedlist) {
+     $result.='</table>';
-       my ($uname,$udom) = split(/:/,$student);
-       if ($ENV{'form.submitonly'} eq 'yes') {
+     my $viewgrade;
- 	  my (%status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname,$partlist) ;
+     if ($ENV{'form.handgrade'} eq 'yes') {
- 	  my $statusflg = '';
+ 	$viewgrade = 'View/Grade';
- 	  foreach (keys(%status)) {
+     } else {
- 	      $statusflg = 1 if ($status{$_} ne 'nothing');
+ 	$viewgrade = 'View';
- 	  }
+     }
- 	  next if ($statusflg eq '');
-       }
-       push @nextlist,$student if ($ctr < $ntstu);
-       $ctr++;
-   }
-   $ctr = 0;
+     $result='<h3><font color="#339933">&nbsp;'.
-   my $total = scalar(@nextlist)-1;
+ 	$viewgrade.
-   foreach (sort @nextlist) {
+ 	    ' Submissions for a Student or a Group of Students</font></h3>'.
-       my ($uname,$udom) = split(/:/);
+ 		'<table border="0"><tr><td colspan=3><font size=+1>'.
-       $ENV{'form.student'} = $uname;
+ 		    '<b>Resource: </b>'.$url.'</font></td></tr>'.$result;
-       $ENV{'form.fullname'} = $$fullname{$_};
-       &submission($request,$ctr,$total);
-       $ctr++;
-   }
-   if ($total < 0) {
-       my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";
-       $the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
-       $the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
-       $the_end.=&show_grading_menu_form ($symb,$url);
-       $request->print($the_end);
-   }
-   return '';
- }
- sub saveHandGrade {
+     $request->print(<<LISTJAVASCRIPT);
-   my ($request,$url,$symb,$stuname,$domain,$newflg) = @_;
+ <script type="text/javascript" language="javascript">
- #  my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
+   function checkSelect(checkBox) {
-   my %newrecord;
+     var ctr=0;
-   foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
+     var sense="";
-       if ($ENV{'form.GRADE_SEL'.$newflg.'_'.$_} eq 'excused') {
+     if (checkBox.length > 1) {
- 	  $newrecord{'resource.'.$_.'.solved'} = 'excused';
+        for (var i=0; i<checkBox.length; i++) {
-       } else {
+ 	  if (checkBox[i].checked) {
- 	  my $pts    = ($ENV{'form.GRADE_BOX'.$newflg.'_'.$_} ne '' ?
+ 	     ctr++;
- 		       $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';
  	  }
-       }
+        }
-   }
+        sense = "a student or group of students";
+     } else {
-   if ( scalar(keys(%newrecord)) > 0 ) {
+        if (checkBox.checked) {
-       $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ 	   ctr = 1;
- #      while (my ($k,$v) = each %newrecord) {
+        }
- #	 print "k=$k:v=$v:<br>\n";
+        sense = "the student";
- #      }
+     }
-      &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname);
+     if (ctr == 0) {
-   }
+        alert("Please select "+sense+" before clicking on the $viewgrade button.");
-   return '';
+        return false;
- }
+     }
+     document.gradesub.submit();
- 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);
- }
- sub show_grading_menu_form {
-   my ($symb,$url)=@_;
-   my $result.='<form action="/adm/grades" method="post">'."\n".
-     '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
-       '<input type="hidden" name="url" value="'.$url.'" />'."\n".
- 	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
- 	  '<input type="submit" name="submit" value="Grading Menu" />'."\n".
- 	    '</form>'."\n";
-   return $result;
- }
- sub gradingmenu {
-   my ($request) = @_;
-   my ($symb,$url)=&get_symb_and_url($request);
-   if (!$symb) {return '';}
-   my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2>';
-   $result.='<table border="0">';
-   $result.='<tr><td colspan=3><font size=+1><b>Resource: </b>'.$url.'</font></td></tr>';
-   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.='<tr><td><b>Part id: </b>'.$_.'</td>'.
- 	  '<td><b>Type: </b>'.$responsetype.'</td>'.
- 	  '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
-   }
-   $result.='</table>';
-   $result.=&view_edit_entire_class_form($symb,$url).'<br />';
-   $result.=&upcsvScores_form($symb,$url).'<br />';
-   $result.=&viewGradeaStu_form($symb,$url,$resptype,$hdgrade).'<br />';
-   $result.=&verifyReceipt_form($symb,$url).'<br />';
-   $result.=&view_classlist_form($symb,$url);
-   return $result;
- }
- sub view_classlist_form {
-   my ($symb,$url)=@_;
-   my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
-   $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
-   $result.='&nbsp;<b>View Class List</b></td></tr>'."\n";
-   $result.='<tr bgcolor=#ffffe6><td>'."\n";
-   $result.='<form action="/adm/grades" method="post">'."\n".
-       '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
-       '<input type="hidden" name="url" value="'.$url.'" />'."\n".
-       '<input type="hidden" name="command" value="viewclasslist" />'."\n";
-   $result.='&nbsp;<input type="submit" name="submit" value="View Class" /></form>'."\n";
-   $result.='</td></tr></table>'."\n";
-   $result.='</td></tr></table>'."\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('<table border=1>');
-   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('<tr><td>'.$_.' </td><td><pre> '.$classlist{$_}.'</pre></td></tr>');
    }
-   $request->print('</table>');
+ </script>
- #  my $putresult = &Apache::lonnet::put
+ LISTJAVASCRIPT
- #      ('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.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
-   $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
-   $result.='&nbsp;<b>View/Grade Entire Class</b></td></tr>'."\n";
-   $result.='<tr bgcolor=#ffffe6><td>'."\n";
-   $result.='<form action="/adm/grades" method="post">'."\n".
-     '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
-       '<input type="hidden" name="url" value="'.$url.'" />'."\n".
- 	  '<input type="hidden" name="command" value="viewgrades" />'."\n";
-   $result.='&nbsp;<b>Display students who has: </b>'.
-       '<input type="radio" name="submitonly" value="yes" checked> submitted'.
- 	  '<input type="radio" name="submitonly" value="all"> everybody <br /><br />';
-   $result.='&nbsp;<input type="submit" name="submit" value="View/Grade" /></form>'."\n";
-   $result.='</td></tr></table>'."\n";
-   $result.='</td></tr></table>'."\n";
-   return $result;
- }
- sub upcsvScores_form {
-   my ($symb,$url) = @_;
-   if (!$symb) {return '';}
-   my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
-   $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
-   $result.='&nbsp;<b>Specify a file containing the class scores for above resource</b></td></tr>'."\n";
-   $result.='<tr bgcolor=#ffffe6><td>'."\n";
-   my $upfile_select=&Apache::loncommon::upfile_select_html();
-   $result.=<<ENDUPFORM;
- <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
- <input type="hidden" name="symb" value="$symb" />
- <input type="hidden" name="url" value="$url" />
- <input type="hidden" name="command" value="csvuploadmap" />
- $upfile_select
- <br />&nbsp;<input type="submit" name="submit" value="Upload Grades" />
- </form>
- ENDUPFORM
-   $result.='</td></tr></table>'."\n";
-   $result.='</td></tr></table>'."\n";
-   return $result;
- }
- sub viewGradeaStu_form {
+     $request->print($result);
-   my ($symb,$url,$response,$handgrade) = @_;
-   my ($classlist,$sections) = &getclasslist('all','0');
-   my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
-   $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
-   $result.='&nbsp;<b>View/Grade an Individual Student\'s Submission</b></td></tr>'."\n";
-   $result.='<tr bgcolor=#ffffe6><td>'."\n";
-   $result.='<form action="/adm/grades" method="post">'."\n".
-       '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
-       '<input type="hidden" name="url" value="'.$url.'" />'."\n".
-       '<input type="hidden" name="response" value="'.$response.'" />'."\n".
-       '<input type="hidden" name="handgrade" value="'.$handgrade.'" />'."\n".
-       '<input type="hidden" name="command" value="submission" />'."\n";
-   $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";
-   foreach (sort (@$sections)) {
-       $result.= '<option>'.$_.'</option>'."\n";
-   }
-   $result.= '<option selected="on">all</select>'."\n";
-   $result.='&nbsp;&nbsp;<b>Display students who has: </b>'.
-       '<input type="radio" name="submitonly" value="yes" checked> submitted'.
-       '<input type="radio" name="submitonly" value="all"> everybody <br />';
-   $result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />'
-       if (grep /no/,@$sections);
-   $result.='<br />&nbsp;<input type="submit" name="submit" value="View/Grade" />'."\n".
-       '</form>'."\n";
-   $result.='</td></tr></table>'."\n";
-   $result.='</td></tr></table>'."\n";
-   return $result;
- }
- sub verifyReceipt_form {
+     my $checkhdgrade = $ENV{'form.handgrade'} eq 'yes' ? 'checked' : '';
-   my ($symb,$url) = @_;
+     my $checklastsub = $ENV{'form.handgrade'} eq 'yes' ? '' : 'checked';
-   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.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
-   $result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n";
-   $result.='&nbsp;<b>Verify a Submission Receipt Issued by this Server</td></tr>'."\n";
-   $result.='<tr bgcolor=#ffffe6><td>'."\n";
-   $result.='<form action="/adm/grades" method="post">'."\n";
-   $result.='&nbsp;<tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
-   $result.='&nbsp;<input type="submit" name="submit" value="Verify Receipt">'."\n";
-   $result.='<input type="hidden" name="command" value="verify">'."\n";
-   if ($ENV{'form.url'}) {
-       $result.='<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />';
-   }
-   if ($ENV{'form.symb'}) {
-       $result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
-   }
-   $result.='</form>';
-   $result.='</td></tr></table>'."\n";
-   $result.='</td></tr></table>'."\n";
-   return $result;
- }
- sub viewgrades {
+     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'."\n".
-   my ($request) = @_;
+ 	'&nbsp;<b>View Problem: </b><input type="radio" name="vProb" value="no" > no '."\n".
-   my $result='';
+ 	'<input type="radio" name="vProb" value="yes" checked > yes <br />'."\n".
+ 	'&nbsp;<b>Submissions: </b>'."\n";
+     if ($ENV{'form.handgrade'} eq 'yes') {
+ 	$gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> handgrade only'."\n";
+     }
+     $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last sub only'."\n".
+ 	'<input type="radio" name="lastSub" value="last" /> last sub & parts info'."\n".
+ 	'<input type="radio" name="lastSub" value="all" /> all details'."\n".
+ 	'<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
+ 	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
+ 	'<input type="hidden" name="response"    value="'.$ENV{'form.response'}.'" />'."\n".
+ 	'<input type="hidden" name="handgrade"   value="'.$ENV{'form.handgrade'}.'" /><br />'."\n".
+ 	'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" /><br />'."\n".
+ 	'<input type="hidden" name="url"  value="'.$url.'" />'."\n".
+ 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ 	'To '.lc($viewgrade).' a submission, click on the check box next to the student\'s name. Then '."\n".
+ 	'click on the '.$viewgrade.' button. To view the submissions for a group of students, click'."\n".
+ 	' on the check boxes for the group of students.<br />'."\n".
+ 	'<input type="hidden" name="command" value="processGroup" />'."\n".
+ 	'<input type="button" '."\n".
+ 	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
+ 	'value="'.$viewgrade.'" />'."\n";
+     my (undef,undef,$fullname) = &getclasslist($getsec,'0');
+     $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
+ 	'<table border="0"><tr bgcolor="#e6ffff">'.
+ 	'<td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Fullname&nbsp;</b></td>'.
+ 	'<td><b>&nbsp;Username&nbsp;</b></td><td><b>&nbsp;Domain&nbsp;</b></td>';
+     foreach (sort(@$partlist)) {
+ 	$gradeTable.='<td><b>&nbsp;Part '.(split(/_/))[0].' Status&nbsp;</b></td>';
+     }
+     $gradeTable.='</tr>'."\n";
+     my $ctr = 0;
+     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+ 	my ($uname,$udom) = split(/:/,$student);
+ 	my (%status) =&student_gradeStatus($url,$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 = '';
+ 		$gradeTable.='<input type="hidden" name="'.
+ 		    $student.':submitted_by" value="'.
+ 		    $status{'resource.'.$partid.'.submitted_by'}.'" />';
+ 	    }
+ 	}
+ 	next if ($statusflg eq '' && $submitonly eq 'yes');
-   #get resource reference
+ 	$ctr++;
-   my ($symb,$url)=&get_symb_and_url($request);
+ 	if ( $Apache::grades::viewgrades eq 'F' ) {
-   if (!$symb) {return '';}
+ 	    $gradeTable.='<tr bgcolor="#ffffe6">'.
-   #get classlist
+ 		'<td align="center"><input type=checkbox name="stuinfo" value="'.
-   my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+ 		$student.':'.$$fullname{$student}.'"></td>'."\n".
-   #print "Found $cdom:$cnum<br />";
+ 		'<td>&nbsp;'.$$fullname{$student}.'&nbsp;</td>'."\n".
-   my ($classlist) = &getclasslist('all','0');
+ 		'<td>&nbsp;'.$uname.'&nbsp;</td>'."\n".
-   my $headerclr = '"#ddffff"';
+ 		'<td align="middle">&nbsp;'.$udom.'&nbsp;</td>'."\n";
-   my $cellclr = '"#ffffdd"';
+ 	    foreach (sort keys(%status)) {
-   #get list of parts for this problem
+ 		next if (/^resource.*?submitted_by$/);
-   my (@parts) = sort(&getpartlist($url));
+ 		$gradeTable.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
+ 	    }
-   $request->print ("<h2><font color=\"#339933\">Manual Grading</font></h2>");
+ 	    $gradeTable.='</tr>'."\n";
+ 	}
-   #start the form
+     }
-   $result = '<form action="/adm/grades" method="post">'."\n".
+     $gradeTable.='</table></td></tr></table>'.
-     '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ 	'<input type="button" '.
-       '<input type="hidden" name="url" value="'.$url.'" />'."\n".
+ 	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
- 	'<input type="hidden" name="command" value="editgrades" />'."\n".
+ 	'value="'.$viewgrade.'" /></form>'."\n";
- 	  '<input type="submit" name="submit" value="Submit Changes" />'."\n".
+     if ($ctr == 0) {
- 	    '<table border=0><tr><td bgcolor="#777777">'."\n".
+ 	$gradeTable='<br />&nbsp;<font color="red">'.
- 	     '<table border=0>'."\n".
+ 	    'No submission found for this resource.</font><br />';
- 	      '<tr bgcolor='.$headerclr.'><td><b>Username</b></td><td><b>Fullname</b></td><td><b>Domain</b></td>'."\n";
+     } elsif ($ctr == 1) {
-   foreach my $part (@parts) {
+ 	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
-      my $display=&Apache::lonnet::metadata($url,$part.'.display');
+     }
-      if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
+     $gradeTable.=&show_grading_menu_form($symb,$url);
-      $result.='<td><b>'.$display.'</b></td>'."\n";
+     $request->print($gradeTable);
-   }
+     return '';
-   $result.='</tr>';
-   #get info for each student
-   foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
- #    my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
- #      print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:<br>\n";
-     $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
-   }
-   $result.='</table></td></tr></table>';
-   $result.='<input type="submit" name="submit" value="Submit Changes" /></form>';
-   $result.=&show_grading_menu_form($symb,$url);
-   return $result;
  }
- sub editgrades {
+ #---- Called from the listStudents routine
-   my ($request) = @_;
+ #     Displays the submissions for one student or a group of students
-   my $result='';
+ sub processGroup {
+     my ($request)  = shift;
-   my $symb=$ENV{'form.symb'};
+     my $ctr        = 0;
-   if ($symb eq '') { $request->print("Unable to handle ambiguous references:$symb:$ENV{'form.url'}"); return ''; }
+     my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}
-   my $url=$ENV{'form.url'};
+ 		      : ($ENV{'form.stuinfo'}));
-   #get classlist
+     my $total      = scalar(@stuchecked)-1;
- #  my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
-   #print "Found $cdom:$cnum<br />";
+     foreach (@stuchecked) {
-   my ($classlist) = &getclasslist('all','0');
+ 	my ($uname,$udom,$fullname) = split(/:/);
+ 	$ENV{'form.student'}        = $uname;
-   #get list of parts for this problem
+ 	$ENV{'form.userdom'}        = $udom;
-   my (@parts) = &getpartlist($url);
+ 	$ENV{'form.fullname'}       = $fullname;
+ 	&submission($request,$ctr,$total);
-   $result.='<form action="/adm/grades" method="post">'."\n".
+ 	$ctr++;
-     '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+     }
-       '<input type="hidden" name="url" value="'.$url.'" />'."\n".
+     return '';
- 	'<input type="hidden" name="command" value="viewgrades" />'."\n".
- 	  '<input type="submit" name="submit" value="See Grades" /> <br />'."\n";
-   foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
-     $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
-   }
-   $result.='<input type="submit" name="submit" value="See Grades" /></table></form>';
-   return $result;
  }
+ #------------------------------------------------------------------------------------
+ #
+ #-------------------------- 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;
+     my $request = shift;
-   $request->print(<<SUBJAVASCRIPT);
+     $request->print(<<SUBJAVASCRIPT);
  <script type="text/javascript" language="javascript">
-   function updateRadio(radioButton,formtextbox,formsel,scores) {
+   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);
+         alert("A number equal or greater than 0 is expected. Entered value = "+pts);
- 	for (var i=0; i<radioButton.length; i++) {
+         for (var i=0; i<radioButton.length; i++) {
- 	   if (radioButton[i].checked) {
+            if (radioButton[i].checked) {
  	      formtextbox.value = i;
  	      resetbox = true;
  	   }
- Line 1122  sub sub_page_js {
+ Line 467  sub sub_page_js {
  	   formtextbox.value = "";
  	}
  	return;
+      }
+      if (pts > 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<radioButton.length; i++) {
- Line 1160  sub sub_page_js {
+ Line 514  sub sub_page_js {
      return;
    }
+ //=================== Check that a point is assigned for all the parts  ==============
+   function checksubmit(val,total,parttot) {
+      document.SCORE.gradeOpt.value = val;
+      if (val == "Save & Next") {
+ 	for (i=0;i<=total;i++) {
+ 	   for (j=0;j<parttot;j++) {
+ 	      var partid = eval("document.SCORE.partid"+i+"_"+j+".value");
+ 	      var selopt = eval("document.SCORE.GD_SEL"+i+"_"+partid);
+ 	      if (selopt[0].selected) {
+ 		 var points = eval("document.SCORE.GD_BOX"+i+"_"+partid+".value");
+ 		 if (points == "") {
+ 		     var name = eval("document.SCORE.name"+i+".value");
+ 		     alert("Please assign a score for "+name+", part "+partid+".");
+ 		     return false;
+ 		 }
+ 	      }
+ 	  }
+        }
+      }
+      document.SCORE.submit();
+  }
  //===================== Show list of keywords ====================
    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;
+     document.SCORE.refresh.value = "on";
+     if (document.SCORE.keywords.value != "") {
+ 	document.SCORE.submit();
+     }
+     return;
+   }
+ //===================== Script to view submitted by ==================
+   function viewSubmitter(submitter) {
+     document.SCORE.refresh.value = "on";
+     document.SCORE.NCT.value = "1";
+     document.SCORE.unamedom0.value = submitter;
+     document.SCORE.submit();
      return;
    }
- Line 1176  sub sub_page_js {
+ Line 568  sub sub_page_js {
      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.");
+ 	alert("Please 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;
+     document.SCORE.refresh.value = "on";
+     if (document.SCORE.keywords.value != "") {
+ 	document.SCORE.submit();
+     }
      return;
    }
- Line 1193  sub sub_page_js {
+ Line 589  sub sub_page_js {
      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" }
- Line 1255  sub sub_page_js {
+ Line 650  sub sub_page_js {
      pWin.document.write("  var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
      pWin.document.write("  includemsg.value = msgchk;");
- //    pWin.document.write("  alert(\\"slected=\\"+msgchk)");
      pWin.document.write("  self.close()");
      pWin.document.write("}");
- Line 1345  function displaySavedMsg(ctr,msg,shwsel)
+ Line 739  function displaySavedMsg(ctr,msg,shwsel)
      hwdWin.document.write("  opener.document.SCORE.kwclr.value = radioSelection(document.hlCenter.kwdclr);");
      hwdWin.document.write("  opener.document.SCORE.kwsize.value = radioSelection(document.hlCenter.kwdsize);");
      hwdWin.document.write("  opener.document.SCORE.kwstyle.value = radioSelection(document.hlCenter.kwdstyle);");
- //    hwdWin.document.write("     var kwords=opener.document.SCORE.keywords.value;");
+     hwdWin.document.write("  opener.document.SCORE.refresh.value = \\"on\\";");
- //    hwdWin.document.write("     alert(\\"keywords=\\"+opener.document.SCORE.keywords.value);");
+     hwdWin.document.write("  if (opener.document.SCORE.keywords.value!=\\"\\"){");
- //    hwdWin.document.write("     return;");
+     hwdWin.document.write("     opener.document.SCORE.submit();");
+     hwdWin.document.write("  }");
-     hwdWin.document.write("  if (flag==1){");
-     hwdWin.document.write("     opener.document.SCORE.refresh.value = \\"on\\";");
-     hwdWin.document.write("     if (opener.document.SCORE.keywords.value!=\\"\\"){");
-     hwdWin.document.write("        opener.document.SCORE.submit();");
-     hwdWin.document.write("     }");
-     hwdWin.document.write("   }");
      hwdWin.document.write("  self.close()");
      hwdWin.document.write("}");
- Line 1395  function displaySavedMsg(ctr,msg,shwsel)
+ Line 783  function displaySavedMsg(ctr,msg,shwsel)
    function highlightend() {
      hwdWin.document.write("</table>");
      hwdWin.document.write("</td></tr></table>&nbsp;");
-     hwdWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(0)\\">&nbsp;&nbsp;");
+ //    hwdWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(0)\\">&nbsp;&nbsp;");
-     hwdWin.document.write("<input type=\\"button\\" value=\\"Save & Refresh\\" onClick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
+     hwdWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
      hwdWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
      hwdWin.document.write("</form>");
      hwdWin.document.write("</body></html>");
- Line 1406  function displaySavedMsg(ctr,msg,shwsel)
+ Line 794  function displaySavedMsg(ctr,msg,shwsel)
  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';
+     # header info
+     if ($counter == 0) {
+ 	&sub_page_js($request);
+ 	$request->print('<h3>&nbsp;<font color="#339933">Submission Record</font></h3>'."\n".
+ 			'<font size=+1>&nbsp;<b>Resource: </b>'.$url.'</font>'."\n");
+ 	# 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.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
+ 	    $result.='<table border="0" width="100%"><tr><td bgcolor="#e6ffff">';
+ 	    $result.='<b> View of the problem - '.$ENV{'form.fullname'}.
+ 		'</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />';
+ 	    $result.='<b>Correct answer:</b><br />'.$companswer;
+ 	    $result.='</td></tr></table>';
+ 	    $result.='</td></tr></table><br />';
+ 	    $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('<form action="/adm/grades" method="post" name="SCORE">'."\n".
+ 			'<input type="hidden" name="command"    value="handgrade" />'."\n".
+ 			'<input type="hidden" name="refresh"    value="off" />'."\n".
+ 			'<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
+ 			'<input type="hidden" name="url"        value="'.$url.'" />'."\n".
+ 			'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" />'."\n".
+ 			'<input type="hidden" name="vProb"      value="'.$ENV{'form.vProb'}.'" />'."\n".
+ 			'<input type="hidden" name="lastSub"    value="'.$ENV{'form.lastSub'}.'" />'."\n".
+ 			'<input type="hidden" name="section"    value="'.$ENV{'form.section'}.'">'."\n".
+ 			'<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
+ 			'<input type="hidden" name="response"   value="'.$ENV{'form.response'}.'">'."\n".
+ 			'<input type="hidden" name="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\n".
+ 			'<input type="hidden" name="keywords"   value="'.$ENV{'form.keywords'}.'" />'."\n".
+ 			'<input type="hidden" name="kwclr"      value="'.$ENV{'form.kwclr'}.'" />'."\n".
+ 			'<input type="hidden" name="kwsize"     value="'.$ENV{'form.kwsize'}.'" />'."\n".
+ 			'<input type="hidden" name="kwstyle"    value="'.$ENV{'form.kwstyle'}.'" />'."\n".
+ 			'<input type="hidden" name="msgsub"     value="'.$ENV{'form.msgsub'}.'" />'."\n".
+ 			'<input type="hidden" name="savemsgN"   value="'.$ENV{'form.savemsgN'}.'" />'."\n".
+ 			'<input type="hidden" name="NCT"'.
+ 			' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
+ 	my ($cts,$prnmsg) = (1,'');
+ 	while ($cts <= $ENV{'form.savemsgN'}) {
+ 	    $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
+ 		($keyhash{$symb.'_savemsg'.$cts} eq '' ? $ENV{'form.savemsg'.$cts} : $keyhash{$symb.'_savemsg'.$cts}).
+ 		'" />'."\n";
+ 	    $cts++;
+ 	}
+ 	$request->print($prnmsg);
+ 	if ($ENV{'form.handgrade'} eq 'yes' && $ENV{'form.showgrading'} eq 'yes') {
+ 	    $request->print(<<KEYWORDS);
+ &nbsp;<b>Keyword Options:</b>&nbsp;
+ <a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>List</a>&nbsp; &nbsp;
+ <a href="#" onMouseDown="javascript:getSel(); return false"
+  CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
+ <a href="javascript:kwhighlight()"; TARGET=_self>Highlight Attribute</a><br /><br />
+ 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 ? '' : '<br />'));
+     my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'."\n".
+ 	'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n";
+     $result.='<b>Fullname: </b>'.$ENV{'form.fullname'}.
+ 	'<font color="#999999">&nbsp; &nbsp;Username: '.$uname.'</font>'.
+ 	'<font color="#999999">&nbsp; &nbsp;Domain: '.$udom.'</font><br />'."\n";
+     $result.='<input type="hidden" name="name'.$counter.
+ 	'" value="'.$ENV{'form.fullname'}.'" />'."\n";
+     # If this is handgraded, then check for collaborators
+     my @col_fullnames;
+     my ($classlist,$fullname);
+     if ($ENV{'form.handgrade'} eq 'yes') {
+ 	my @col_list;
+ 	($classlist,undef,$fullname) = &getclasslist('all','0');
+ 	for (keys (%$handgrade)) {
+ 	    my $ncol = &Apache::lonnet::EXT('resource.'.$_.
+ 					    '.maxcollaborators',
+                                             $symb,$udom,$uname);
+ 	    next if ($ncol <= 0);
+             s/\_/\./g;
+             next if ($record{'resource.'.$_.'.collaborators'} eq '');
+             my (@collaborators) = split(/,?\s+/,
+                                    $record{'resource.'.$_.'.collaborators'});
+             my (@badcollaborators);
+             if (scalar(@collaborators) != 0) {
+                 $result.='<b>Collaborators: </b>';
+                 foreach my $collaborator (@collaborators) {
+                     my ($co_name,$co_dom) = split /\@|:/,$collaborator;
+                     $co_dom = $udom if (! defined($co_dom));
+                     next if ($co_name eq $uname && $co_dom eq $udom);
+                     # Doing this grep allows 'fuzzy' specification
+                     my @Matches = grep /^$co_name:$co_dom/i,
+                     keys %$classlist;
+                     if (! scalar(@Matches)) {
+                         push @badcollaborators,$collaborator;
+                         next;
+                     }
+                     push @col_list, @Matches;
+                     foreach (@Matches) {
+                         my ($lastname,$givenn) = split(/,/,$$fullname{$_});
+                         push @col_fullnames, $givenn.' '.$lastname;
+                         $result.=$$fullname{$_}.'&nbsp; &nbsp; &nbsp;';
+                     }
+                 }
+                 $result.='<br />'."\n";
+                 if (scalar(@badcollaborators) > 0) {
+                     $result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
+                     $result.='This student has submitted ';
+                     if (scalar(@badcollaborators) == 1) {
+                         $result .= 'an invalid collaborator';
+                     } else {
+                         $result .= 'invalid collaborators';
+                     }
+                     $result .= ': '.join(', ',@badcollaborators);
+                 }
+                 if (scalar(@collaborators > $ncol)) {
+                     $result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>';
+                     $result .= 'This student has sumbitted too many '.
+                         'collaborators.  Maximum is '.$ncol;
+                     $result .= '</td></tr></table>';
+                 }
+                 $result.='<input type="hidden" name="collaborator'.$counter.
+                     '" value="'.(join ':',@col_list).'" />'."\n";
+             }
+ 	}
+     }
+     $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=''.
+ 		'<b>Collaborative submission by: </b>'.
+ 		'<a href="javascript:viewSubmitter(\''.
+ 		$ENV{'form.'.$uname.':'.$udom.':submitted_by'}.
+ 		'\')"; TARGET=_self>'.
+ 		$$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.'</a>';
+ 	    $request->print($submitby);
+ 	} else {
+ 	    my ($string,$timestamp)=
+ 		&get_last_submission (%record);
+ 	    my $lastsubonly.=''.
+ 		($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
+ 		 $$timestamp).'';
+ 	    if ($$timestamp eq '') {
+ 		$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0].'</td></tr>'."\n";
+ 	    } 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.='<tr><td bgcolor="#ffffe6"><b>Part '.
+ 				$partid.'</b> <font color="#999999">( ID '.$respid.
+ 				' )</font>&nbsp; &nbsp;<b>Answer: </b>'.
+ 				&keywords_highlight($subval).'</td></tr>'."\n"
+ 				if ($ENV{'form.lastSub'} eq 'lastonly' ||
+ 				    ($ENV{'form.lastSub'} eq 'hdgrade' &&
+ 				     $$handgrade{$part} =~ /:yes$/));
+ 			}
+ 		    }
+ 		}
+ 	    }
+ 	    $lastsubonly.='</td></tr>'."\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'));
+     }
+     # return if view submission with no grading option
+     if ($ENV{'form.showgrading'} eq '') {
+ 	$request->print('</td></tr></table></td></tr></table></form>'."\n");
+ 	return;
+     }
+     # Grading options
+     $result='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
+ 	'<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
+ 	'<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
+ 	.$udom.'" />'."\n";
+     my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
+     my $msgfor = $givenn.' '.$lastname;
+     if (scalar(@col_fullnames) > 0) {
+ 	my $lastone = pop @col_fullnames;
+ 	$msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
+     }
+     $result.='<tr><td bgcolor="#ffffff">'."\n".
+ 	'&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
+ 	',\''.$msgfor.'\')"; TARGET=_self>'.
+ 	'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a>'.
+ 	'<br />&nbsp;(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)' :
+ 		      '<font color="red">problem weight assigned by computer</font>');
+ 	$wgt       = ($wgt > 0 ? $wgt : '1');
+ 	my $score  = ($record{'resource.'.$partid.'.awarded'} eq '' ?
+ 		      '' : $record{'resource.'.$partid.'.awarded'}*$wgt);
+ 	$result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />';
+ 	$result.='<table border="0"><tr><td><b>Part </b>'.$partid.' <b>Points: </b></td><td>';
+ 	my $ctr = 0;
+ 	$result.='<table border="0"><tr>';  # display radio buttons in a nice table 10 across
+ 	while ($ctr<=$wgt) {
+ 	    $result.= '<td><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+ 		'onclick="javascript:writeBox(this.form.GD_BOX'.$counter.'_'.$partid.
+ 		',this.form.GD_SEL'.$counter.'_'.$partid.','.$ctr.
+ 		',this.form.stores'.$counter.'_'.$partid.')" '.
+ 		($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
+ 	    $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+ 	    $ctr++;
+ 	}
+ 	$result.='</tr></table>';
+ 	$result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>';
+ 	$result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
+ 	    ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
+ 	    'onChange="javascript:updateRadio(this.form.RADVAL'.$counter.'_'.$partid.
+ 	    ',this.form.GD_BOX'.$counter.'_'.$partid.
+ 	    ',this.form.GD_SEL'.$counter.'_'.$partid.
+ 	    ',this.form.stores'.$counter.'_'.$partid.
+ 	    ','.$wgt.')" /></td>'."\n";
+ 	$result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
+ 	$result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
+ 	    'onChange="javascript:clearRadBox(this.form.RADVAL'.$counter.'_'.$partid.
+ 	    ',this.form.GD_BOX'.$counter.'_'.$partid.
+ 	    ',this.form.GD_SEL'.$counter.'_'.$partid.
+ 	    ',this.form.stores'.$counter.'_'.$partid.')" />'."\n".
+ 	    '<option selected="on"> </option>'.
+ 	    '<option>excused</option></select>'."&nbsp&nbsp\n";
+ 	$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="0" />';
+ 	$result.='</td></tr></table>'."\n";
+ 	$request->print($result);
+     }
+     $result='<input type="hidden" name="partlist'.$counter.
+ 	'" value="'.(join ":",@partlist).'" />'."\n";
+     my $ctr = 0;
+     while ($ctr < scalar(@partlist)) {
+ 	$result.='<input type="hidden" name="partid'.$counter.'_'.$ctr.'" value="'.
+ 	    $partlist[$ctr].'" />'."\n";
+ 	$ctr++;
+     }
+     $request->print($result.'</td></tr></table></td></tr></table>'."\n");
+     # print end of form
+     if ($counter == $total) {
+ 	my $endform='<table border="0"><tr><td>'.
+ 	    '<input type="hidden" name="gradeOpt" value="" />'."\n";
+ 	if ($ENV{'form.handgrade'} eq 'yes') {
+ 	    $endform.='<input type="button" value="Save & Next" '.
+ 		'onClick="javascript:checksubmit(\'Save & Next\','.
+ 		$total.','.scalar(@partlist).');" TARGET=_self> &nbsp;'."\n";
+ 	    my $ntstu ='<select name="NTSTU">'.
+ 		'<option>1</option><option>2</option>'.
+ 		'<option>3</option><option>5</option>'.
+ 		'<option>7</option><option>10</option></select>'."\n";
+ 	    my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
+ 	    $ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
+ 	    $endform.=$ntstu.'student(s) &nbsp;&nbsp;';
+ 	} else {
+ 	    $endform.='<input type="hidden" name="NTSTU" value="1" />'."\n";
+ 	}
+ 	$endform.='<input type="button" value="Next" '.
+ 	    'onClick="javascript:checksubmit(\'Next\');" TARGET=_self> &nbsp;'."\n".
+ 	    '<input type="button" value="Previous" '.
+ 	    'onClick="javascript:checksubmit(\'Previous\');" TARGET=_self> &nbsp;';
+ 	$endform.='(Next and Previous do not save the scores.)'."\n"
+ 	    if ($ENV{'form.handgrade'} eq 'yes');
+ 	$endform.='</td><tr></table></form>';
+ 	$endform.=&show_grading_menu_form($symb,$url);
+ 	$request->print($endform);
+     }
+     return '';
+ }
+ #--- Retrieve the last submission for all the parts
+ sub get_last_submission {
+     my (%returnhash)=@_;
+     my (@string,$timestamp);
+     if ($returnhash{'version'}) {
+ 	my %lasthash=();
+ 	my ($version);
+ 	for ($version=1;$version<=$returnhash{'version'};$version++) {
+ 	    foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+ 		$lasthash{$_}=$returnhash{$version.':'.$_};
+ 		if ($returnhash{$version.':'.$_} =~ /(SUBMITTED|DRAFT)$/) {
+ 		   $timestamp = scalar(localtime($returnhash{$version.':timestamp'}));
+ 	       }
+ 	    }
+ 	}
+ 	foreach ((keys %lasthash)) {
+ 	    if ($_ =~ /\.submission$/) {
+ 		my ($partid,$foo) = split(/submission$/,$_);
+ 		my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
+ 		    '<font color="red">Draft Copy</font> ' : '';
+ 		push @string, (join(':',$_,$draft.$lasthash{$_}));
+ 	    }
+ 	}
+     }
+     @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
+     return \@string,\$timestamp;
+ }
+ #--- High light keywords, with style choosen by user.
+ 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/\</\<\//;
+     my @keylist   = split(/[,\s+]/,$ENV{'form.keywords'});
+     foreach (@keylist) {
+ 	$string =~ s/\b$_(\b|\.)/\<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff\<\/font\>/gi;
+     }
+     # This is not really the right place to do this, but I cannot find a
+     # better one at this time.  So here we go - the m in the s:::mg causes
+     # ^ to match the beginning of a new line.  So we replace(???) the beginning
+     # of the line with <br /> to make things formatted a little better.
+     $string =~ s:^:<br />:mg;
+     return $string;
+ }
+ #--- Called from submission routine
+ sub processHandGrade {
+     my ($request) = shift;
+     my $url    = $ENV{'form.url'};
+     my $symb   = $ENV{'form.symb'};
+     my $button = $ENV{'form.gradeOpt'};
+     my $ngrade = $ENV{'form.NCT'};
+     my $ntstu  = $ENV{'form.NTSTU'};
+     if ($button eq 'Save & Next') {
+ 	my $ctr = 0;
+ 	while ($ctr < $ngrade) {
+ 	    my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
+ 	    my ($errorflag) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
+ 	    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($request,$url,$symb,$_,$udom,$ctr,
+ 				   $ENV{'form.unamedom'.$ctr});
+ 		    if ($message ne '') {
+ 			$msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom,
+ 								       $ENV{'form.msgsub'},
+ 								       $message);
+ 		    }
+ 		}
+ 	    }
+ 	    $ctr++;
+ 	}
+     }
+     # 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 (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
+     my (@parsedlist,@nextlist);
+     my ($nextflg) = 0;
+     foreach (sort {lc($$fullname{$a}) cmp lc($$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:<br>";
+ 	&submission($request,$ctr,$total);
+ 	$ctr++;
+     }
+     if ($total < 0) {
+ 	my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";
+ 	$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
+ 	$the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
+ 	$the_end.=&show_grading_menu_form ($symb,$url);
+ 	$request->print($the_end);
+     }
+     return '';
+ }
+ #---- 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 (split(/:/,$ENV{'form.partlist'.$newflg})) {
+ 	if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq 'excused') {
+ 	    $newrecord{'resource.'.$_.'.solved'} = 'excused'
+ 		if ($record{'resource.'.$_.'.solved'} ne 'excused');
+ 	} else {
+ 	    my $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ?
+ 		       $ENV{'form.GD_BOX'.$newflg.'_'.$_} :
+ 		       $ENV{'form.RADVAL'.$newflg.'_'.$_});
+ 	    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 {
+ 		$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,
+ 				$ENV{'request.course.id'},$domain,$stuname);
+     }
+     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;
+     $request->print(<<VIEWJAVASCRIPT);
+ <script type="text/javascript" language="javascript">
+    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<radioButton.length; i++) {
+ 		    if (radioButton[i].checked) {
+ 			textbox.value = i;
+ 			resetbox = true;
+ 		    }
+ 		}
+ 		if (!resetbox) {
+ 		    textbox.value = "";
+ 		}
+ 		return;
+ 	    }
+ 	    if (point > 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<radioButton.length; i++) {
+ 		radioButton[i].checked=false;
+ 		if (point == i) {
+ 		    radioButton[i].checked=true;
+ 		}
+ 	    }
+ 	} else {
+ 	    textbox.value = point;
+ 	}
+ 	for (i=0;i<document.classgrade.total.value;i++) {
+ 	    var user = eval("document.classgrade.ctr"+i+".value");
+ 	    var scorename = eval("document.classgrade.GD_"+user+
+ 				 "_"+partid+"_awarded");
+ 	    var saveval   = eval("document.classgrade.GD_"+user+
+ 				 "_"+partid+"_solved_s.value");
+ 	    var selname   = eval("document.classgrade.GD_"+user+"_"+partid+"_solved");
+ 	    if (saveval != "correct") {
+ 		scorename.value = point;
+ 		if (selname[0].selected != true) {
+ 		    selname[0].selected = true;
+ 		}
+ 	    }
+ 	}
+ 	var selval   = eval("document.classgrade.SELVAL_"+partid);
+ 	selval[0].selected = true;
+     }
+     function writeRadText(partid,weight) {
+ 	var selval   = eval("document.classgrade.SELVAL_"+partid);
+ 	var radioButton = eval("document.classgrade.RADVAL_"+partid);
+ 	var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+ 	if (selval[1].selected) {
+ 	    for (var i=0; i<radioButton.length; i++) {
+ 		radioButton[i].checked=false;
+ 	    }
+ 	    textbox.value = "";
+ 	    for (i=0;i<document.classgrade.total.value;i++) {
+ 		var user = eval("document.classgrade.ctr"+i+".value");
+ 		var scorename = eval("document.classgrade.GD_"+user+
+ 				     "_"+partid+"_awarded");
+ 		var saveval   = eval("document.classgrade.GD_"+user+
+ 				     "_"+partid+"_solved_s.value");
+ 		var selname   = eval("document.classgrade.GD_"+user+
+ 				     "_"+partid+"_solved");
+ 		if (saveval != "correct") {
+ 		    scorename.value = "";
+ 		    selname[1].selected = true;
+ 		}
+ 	    }
+ 	} else {
+ 	    for (i=0;i<document.classgrade.total.value;i++) {
+ 		var user = eval("document.classgrade.ctr"+i+".value");
+ 		var scorename = eval("document.classgrade.GD_"+user+
+ 				     "_"+partid+"_awarded");
+ 		var saveval   = eval("document.classgrade.GD_"+user+
+ 				     "_"+partid+"_solved_s.value");
+ 		var selname   = eval("document.classgrade.GD_"+user+
+ 				     "_"+partid+"_solved");
+ 		if (saveval != "correct") {
+ 		    scorename.value = eval("document.classgrade.GD_"+user+
+ 				     "_"+partid+"_awarded_s.value");;
+ 		    selname[0].selected = true;
+ 		}
+ 	    }
+ 	}
+     }
+     function changeSelect(partid,user) {
+ 	var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_solved");
+ 	var textbox = eval("document.classgrade.GD_"+user+'_'+partid+"_awarded");
+ 	var point  = textbox.value;
+ 	var weight = eval("document.classgrade.weight_"+partid+".value");
+ 	if (isNaN(point) || point < 0) {
+ 	    alert("A number equal or greater than 0 is expected. Entered value = "+point);
+ 	    textbox.value = "";
+ 	    return;
+ 	}
+ 	if (point > 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+"_solved");
+ 	if (selval[1].selected) {
+ 	    var boxval = eval("document.classgrade.GD_"+user+'_'+partid+"_awarded");
+ 	    boxval.value = "";
+ 	}
+     }
+     function resetEntry(numpart) {
+ 	for (ctpart=0;ctpart<numpart;ctpart++) {
+ 	    var partid = eval("document.classgrade.partid_"+ctpart+".value");
+ 	    var radioButton = eval("document.classgrade.RADVAL_"+partid);
+ 	    var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+ 	    var selval  = eval("document.classgrade.SELVAL_"+partid);
+ 	    for (var i=0; i<radioButton.length; i++) {
+ 		radioButton[i].checked=false;
+ 	    }
+ 	    textbox.value = "";
+ 	    selval[0].selected = true;
+ 	    for (i=0;i<document.classgrade.total.value;i++) {
+ 		var user = eval("document.classgrade.ctr"+i+".value");
+ 		var resetscore = eval("document.classgrade.GD_"+user+
+ 				      "_"+partid+"_awarded");
+ 		resetscore.value = eval("document.classgrade.GD_"+user+
+ 					"_"+partid+"_awarded_s.value");
+ 		var saveselval   = eval("document.classgrade.GD_"+user+
+ 				     "_"+partid+"_solved_s.value");
+ 		var selname   = eval("document.classgrade.GD_"+user+"_"+partid+"_solved");
+ 		if (saveselval == "excused") {
+ 		    if (selname[1].selected == false) { selname[1].selected = true;}
+ 		} else {
+ 		    if (selname[0].selected == false) {selname[0].selected = true};
+ 		}
+ 	    }
+ 	}
+     }
+ </script>
+ VIEWJAVASCRIPT
+ }
+ #--- show scores for a section or whole class w/ option to change/update a score
+ sub viewgrades {
+     my ($request) = shift;
+     &viewgrades_js($request);
+     my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'});
+     my $result='<h3><font color="#339933">Manual Grading</font></h3>';
+     $result.='<font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font>'."\n";
+     #view individual student submission form - called using Javascript viewOneStudent
+     $result.=&jscriptNform($url,$symb);
+     #beginning of class grading form
+     $result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".
+ 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
+ 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
+ 	'<input type="hidden" name="command" value="editgrades" />'."\n".
+ 	'<input type="hidden" name="section" value="'.$ENV{'form.section'}.'" />'."\n";
+     $result.='<h3>Assign Common Grade To ';
+     if ($ENV{'form.section'} eq 'all') {
+ 	$result.='Class </h3>';
+     } elsif ($ENV{'form.section'} eq 'no') {
+ 	$result.='Students in no Section </h3>';
+     } else {
+ 	$result.='Students in Section '.$ENV{'form.section'}.'</h3>';
+     }
+     $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
+ 	'<table border=0><tr bgcolor="#ffffdd"><td>';
+ #    $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. <font color="red">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.</font>';
+ #    $result.='</td></tr><tr><td>';
+     #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.='<table border="0">';
+     my %seen = ();
+     for (sort keys(%$handgrade)) {
+ 	my ($partid,$respid) = split (/_/,$_,2);
+ 	next if $seen{$partid};
+ 	$seen{$partid}++;
+ 	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
+ 	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
+ 	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
+ 	$result.='<input type="hidden" name="partid_'.
+ 	    $ctsparts.'" value="'.$partid.'" />'."\n";
+ 	$result.='<input type="hidden" name="weight_'.
+ 	    $partid.'" value="'.$weight{$partid}.'" />'."\n";
+ 	$result.='<tr><td><b>Part  '.$partid.'&nbsp; &nbsp;Point:</b> </td><td>';
+ 	$result.='<table border="0"><tr>';
+ 	my $ctr = 0;
+ 	while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
+ 	    $result.= '<td><input type="radio" name="RADVAL_'.$partid.'" '.
+ 		'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}.
+ 		','.$ctr.')" />'.$ctr."</td>\n";
+ 	    $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+ 	    $ctr++;
+ 	}
+ 	$result.='</tr></table>';
+ 	$result.= '</td><td><b> or </b><input type="text" name="TEXTVAL_'.
+ 	    $partid.'" size="4" '.'onChange="javascript:writePoint(\''.
+ 		$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
+ 	    $weight{$partid}.' (problem weight)</td>'."\n";
+ 	$result.= '</td><td><select name="SELVAL_'.$partid.'"'.
+ 	    'onChange="javascript:writeRadText(\''.$partid.'\','.
+ 		$weight{$partid}.')" /> '.
+ 	    '<option selected="on"> </option>'.
+ 	    '<option>excused</option></select></td></tr>'."\n";
+ 	$ctsparts++;
+     }
+     $result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
+ 	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
+     $result.='<input type="button" value="Reset" '.
+ 	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self> &nbsp; &nbsp;';
+     $result.='<input type="button" value="Submit Changes" '.
+ 	'onClick="javascript:submit();" TARGET=_self />'."\n";
+     #table listing all the students in a section/class
+     #header of table
+     $result.= '<h3>Assign Grade to Specific Students in ';
+     if ($ENV{'form.section'} eq 'all') {
+ 	$result.='the Class </h3>';
+     } elsif ($ENV{'form.section'} eq 'no') {
+ 	$result.='no Section </h3>';
+     } else {
+ 	$result.='Section '.$ENV{'form.section'}.'</h3>';
+     }
+     $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
+ 	'<table border=0><tr bgcolor="#deffff">'.
+ 	'<td><b>Fullname</b></td><td><b>Username</b></td><td><b>Domain</b></td>'."\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'); }
+ 	if ($display =~ /^Partial Credit Factor/) {
+ 	    my ($partid) = &split_part_type($part);
+ 	    $result.='<td><b>Score Part '.$partid.'<br />(weight = '.
+ 		$weight{$partid}.')</b></td>'."\n";
+ 	    next;
+ 	}
+ 	$display =~ s|Problem Status|Grade Status<br />|;
+ 	$result.='<td><b>'.$display.'</b></td>'."\n";
+     }
+     $result.='</tr>';
+     #get info for each student
+     #list all the students - with points and grade status
+     my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
+     my $ctr = 0;
+     foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+ 	my ($uname,$udom) = split(/:/);
+ 	$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$uname.'" />'."\n";
+ 	$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
+ 				   $_,$$fullname{$_},\@parts,\%weight);
+ 	$ctr++;
+     }
+     $result.='</table></td></tr></table>';
+     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
+     $result.='<input type="button" value="Submit Changes" '.
+ 	'onClick="javascript:submit();" TARGET=_self /></form>'."\n";
+     $result.=&show_grading_menu_form($symb,$url);
+     return $result;
+ }
+ #--- 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='<tr bgcolor="#ffffdd"><td>'.
+ 	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
+ 	'\')"; TARGET=_self>'.$fullname.'</a>'.
+ 	'</td><td>'.$uname.'</td><td align="middle">'.$udom.'</td>'."\n";
+     foreach my $part (@$parts) {
+ 	my ($part,$type) = &split_part_type($part);
+ 	my $score=$record{"resource.$part.$type"};
+ 	if ($type eq 'awarded') {
+ 	    my $pts = $score eq '' ? '' : $score*$$weight{$part};
+ 	    $result.='<input type="hidden" name="'.
+ 		'GD_'.$uname.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
+ 	    $result.='<td align="middle"><input type="text" name="'.
+ 		'GD_'.$uname.'_'.$part.'_awarded" '.
+ 		'onChange="javascript:changeSelect(\''.$part.'\',\''.$uname.
+ 		'\')" value="'.$pts.'" size="4" /></td>'."\n";
+ 	} elsif ($type eq 'solved') {
+ 	    my ($status,$foo)=split(/_/,$score,2);
+ 	    $status = 'nothing' if ($status eq '');
+ 	    $result.='<input type="hidden" name="'.'GD_'.$uname.'_'.
+ 		$part.'_solved_s" value="'.$status.'" />'."\n";
+ 	    $result.='<td align="middle"><select name="'.
+ 		'GD_'.$uname.'_'.$part.'_solved" '.
+ 		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$uname.'\')" >'."\n";
+ 	    my $optsel = '<option selected="on"> </option><option>excused</option>'."\n";
+ 	    $optsel = '<option> </option><option selected="on">excused</option>'."\n"
+ 		if ($status eq 'excused');
+ 	    $result.=$optsel;
+ 	    $result.="</select></td>\n";
+ 	} else {
+ 	    $result.='<input type="hidden" name="'.
+ 		'GD_'.$uname.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
+ 		    "\n";
+ 	    $result.='<td align="middle"><input type="text" name="'.
+ 		'GD_'.$uname.'_'.$part.'_'.$type.'" '.
+ 		'value="'.$score.'" size="4" /></td>'."\n";
+ 	}
+     }
+     $result.='</tr>';
+     return $result;
+ }
+ #--- change scores for all the students in a section/class
+ #    record does not get update if unchanged
+ sub editgrades {
+     my ($request) = @_;
+     my $symb=$ENV{'form.symb'};
+     my $url =$ENV{'form.url'};
+     my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
+     $title.='<font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font><br />'."\n";
+     $title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";
+     $title.= &show_grading_menu_form ($symb,$url);
+     my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
+     $result.= '<table border="0"><tr bgcolor="#deffff">'.
+ 	'<td rowspan=2><b>Username</b></td><td rowspan=2><b>Fullname</b></td>'."\n";
+     my %scoreptr = (
+ 		    'correct'  =>'correct_by_override',
+ 		    'incorrect'=>'incorrect_by_override',
+ 		    'excused'  =>'excused',
+ 		    'ungraded' =>'ungraded_attempted',
+ 		    'nothing'  => '',
+ 		    );
+     my ($classlist,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
+     my (@partid);
+     my %weight = ();
+     my %columns = ();
+     my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
+     my (@parts) = sort(&getpartlist($url));
+     my $header;
+     while ($ctr < $ENV{'form.totalparts'}) {
+ 	my $partid = $ENV{'form.partid_'.$ctr};
+ 	push @partid,$partid;
+ 	$weight{$partid} = $ENV{'form.weight_'.$partid};
+ 	$ctr++;
+     }
+     foreach my $partid (@partid) {
+ 	$header .= '<td align="center">&nbsp;<b>Old Score</b>&nbsp;</td>'.
+ 	    '<td align="center">&nbsp;<b>New Score</b>&nbsp;</td>';
+ 	$columns{$partid}=2;
+ 	foreach my $stores (@parts) {
+ 	    my ($part,$type) = &split_part_type($stores);
+ 	    if ($part !~ m/^\Q$partid\E/) { next;}
+ 	    if ($type eq 'awarded' || $type eq 'solved') { next; }
+ 	    my $display=&Apache::lonnet::metadata($url,$stores.'.display');
+ 	    $display =~ s/\[Part: (\w)+\]//;
+ 	    $header .= '<td align="center">&nbsp;<b>Old</b> '.$display.'&nbsp;</td>'.
+ 		'<td align="center">&nbsp;<b>New</b> '.$display.'&nbsp;</td>';
+ 	    $columns{$partid}+=2;
+ 	}
+     }
+     foreach my $partid (@partid) {
+ 	$result .= '<td colspan="'.$columns{$partid}.
+ 	    '" align="center"><b>Part '.$partid.
+ 	    '</b> (Weight = '.$weight{$partid}.')</td>';
+     }
+     $result .= '</tr><tr bgcolor="#deffff">';
+     $result .= $header;
+     $result .= '</tr>'."\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 (undef,$udom) = split(/:/,$userdom[0]);
+ 	$result .= '<tr bgcolor="#ffffde"><td>'.$user.'&nbsp;</td><td>'.
+ 	    $$fullname{$userdom[0]}.'&nbsp;</td>';
+ 	foreach (@partid) {
+ 	    my $old_aw    = $ENV{'form.GD_'.$user.'_'.$_.'_awarded_s'};
+ 	    my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);
+ 	    my $old_part  = $old_aw eq '' ? '' : $old_part_pcr;
+ 	    my $old_score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_solved_s'}};
+ 	    my $awarded   = $ENV{'form.GD_'.$user.'_'.$_.'_awarded'};
+ 	    my $pcr       = $awarded/($weight{$_} ne '0' ? $weight{$_} : 1);
+ 	    my $partial   = $awarded eq '' ? '' : $pcr;
+ 	    my $score;
+ 	    if ($partial eq '') {
+ 		$score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_solved_s'}};
+ 	    } elsif ($partial > 0) {
+ 		$score = 'correct_by_override';
+ 	    } elsif ($partial == 0) {
+ 		$score = 'incorrect_by_override';
+ 	    }
+ 	    $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_solved'} eq 'excused') &&
+ 				   ($score ne 'excused'));
+ 	    $result .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
+ 		'<td align="center">'.$awarded.
+ 		($score eq 'excused' ? $score : '').'&nbsp;</td>';
+ 	    if (!($old_part eq $partial && $old_score eq $score)) {
+ 		$updateflag = 1;
+ 		$newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
+ 		$newrecord{'resource.'.$_.'.solved'}   = $score;
+ 		$rec_update++;
+ 	    }
+ 	    my $partid=$_;
+ 	    foreach my $stores (@parts) {
+ 		my ($part,$type) = &split_part_type($stores);
+ 		if ($part !~ m/^\Q$partid\E/) { next;}
+ 		if ($type eq 'awarded' || $type eq 'solved') { next; }
+ 		my $old_aw    = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type.'_s'};
+ 		my $awarded   = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type};
+ 		if ($awarded ne '' && $awarded ne $old_aw) {
+ 		    $newrecord{'resource.'.$part.'.'.$type}= $awarded;
+ 		    $updateflag=1;
+ 		}
+ 		$result .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
+ 		    '<td align="center">'.$awarded.'&nbsp;</td>';
+ 	    }
+ 	}
+ 	$result .= '</tr>'."\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 .= '</table></td></tr></table>'."\n";
+     my $msg = '<b>Number of records updated = '.$rec_update.
+ 	' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.
+ 	'<b>Total number of students = '.$ENV{'form.total'}.'</b><br />';
+     return $title.$msg.$result;
+ }
+ sub split_part_type {
+     my ($partstr) = @_;
+     my ($temp,@allparts)=split(/_/,$partstr);
+     my $type=pop(@allparts);
+     my $part=join('.',@allparts);
+     return ($part,$type);
+ }
+ #------------- 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(<<ENDPICK);
    function verify(vf) {
- Line 1480  ENDPICK
+ Line 1954  ENDPICK
  }
  sub csvuploadmap_header {
-   my ($request,$symb,$url,$datatoken,$distotal)= @_;
+     my ($request,$symb,$url,$datatoken,$distotal)= @_;
-   my $result;
+     my $javascript;
-   my $javascript;
+     if ($ENV{'form.upfile_associate'} eq 'reverse') {
-   if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ 	$javascript=&csvupload_javascript_reverse_associate();
-     $javascript=&csvupload_javascript_reverse_associate();
+     } else {
-   } else {
+ 	$javascript=&csvupload_javascript_forward_associate();
-     $javascript=&csvupload_javascript_forward_associate();
+     }
-   }
-   $request->print(<<ENDPICK);
+     my $result='<table border="0">';
+     $result.='<tr><td colspan=3><font size=+1><b>Resource: </b>'.$url.'</font></td></tr>';
+     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.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
+ 	    '<td><b>Type: </b>'.$responsetype.'</td>'.
+ 	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
+     }
+     $result.='</table>';
+     $request->print(<<ENDPICK);
  <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
- <h3>Uploading Class Grades for resource $url</h3>
+ <h3><font color="#339933">Uploading Class Grades</font></h3>
+ $result
  <hr>
  <h3>Identify fields</h3>
  Total number of records found in file: $distotal <hr />
- Line 1512  to this page if the data selected is ins
+ Line 2000  to this page if the data selected is ins
  $javascript
  </script>
  ENDPICK
-   return '';
+ return '';
  }
  sub csvupload_fields {
-   my ($url) = @_;
+     my ($url) = @_;
-   my (@parts) = &getpartlist($url);
+     my (@parts) = &getpartlist($url);
-   my @fields=(['username','Student Username'],['domain','Student Domain']);
+     my @fields=(['username','Student Username'],['domain','Student Domain']);
-   foreach my $part (sort(@parts)) {
+     foreach my $part (sort(@parts)) {
-     my @datum;
+ 	my @datum;
-     my $display=&Apache::lonnet::metadata($url,$part.'.display');
+ 	my $display=&Apache::lonnet::metadata($url,$part.'.display');
-     my $name=$part;
+ 	my $name=$part;
-     if  (!$display) { $display = $name; }
+ 	if  (!$display) { $display = $name; }
-     @datum=($name,$display);
+ 	@datum=($name,$display);
-     push(@fields,\@datum);
+ 	push(@fields,\@datum);
-   }
+     }
-   return (@fields);
+     return (@fields);
  }
  sub csvuploadmap_footer {
-   my ($request,$i,$keyfields) =@_;
+     my ($request,$i,$keyfields) =@_;
-   $request->print(<<ENDPICK);
+     $request->print(<<ENDPICK);
  </table>
  <input type="hidden" name="nfields" value="$i" />
  <input type="hidden" name="keyfields" value="$keyfields" />
- Line 1543  ENDPICK
+ Line 2031  ENDPICK
  }
  sub csvuploadmap {
-   my ($request)= @_;
+     my ($request)= @_;
-   my ($symb,$url)=&get_symb_and_url($request);
+     my ($symb,$url)=&get_symb_and_url($request);
-   if (!$symb) {return '';}
+     if (!$symb) {return '';}
-   my $datatoken;
+     my $datatoken;
-   if (!$ENV{'form.datatoken'}) {
+     if (!$ENV{'form.datatoken'}) {
-     $datatoken=&Apache::loncommon::upfile_store($request);
+ 	$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;
-   my $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','']);
+ 	$datatoken=$ENV{'form.datatoken'};
-       $i=&Apache::loncommon::csv_samples_select_table($request,\@records,
+ 	&Apache::loncommon::load_tmp_file($request);
- 						      \@fields);
-       my %sone=&Apache::loncommon::record_sep($records[0]);
-       $keyfields=join(',',sort(keys(%sone)));
      }
-   }
+     my @records=&Apache::loncommon::upfile_record_sep();
-   &csvuploadmap_footer($request,$i,$keyfields);
+     &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
-   return '';
+     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 '';
  }
  sub csvuploadassign {
-   my ($request)= @_;
+     my ($request)= @_;
-   my ($symb,$url)=&get_symb_and_url($request);
+     my ($symb,$url)=&get_symb_and_url($request);
-   if (!$symb) {return '';}
+     if (!$symb) {return '';}
-   &Apache::loncommon::load_tmp_file($request);
+     &Apache::loncommon::load_tmp_file($request);
-   my @gradedata=&Apache::loncommon::upfile_record_sep();
+     my @gradedata = &Apache::loncommon::upfile_record_sep();
-   my @keyfields = split(/\,/,$ENV{'form.keyfields'});
+     my @keyfields = split(/\,/,$ENV{'form.keyfields'});
-   my %fields=();
+     my %fields=();
-   for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
+     for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
-     if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ 	if ($ENV{'form.upfile_associate'} eq 'reverse') {
-       if ($ENV{'form.f'.$i} ne 'none') {
+ 	    if ($ENV{'form.f'.$i} ne 'none') {
- 	$fields{$keyfields[$i]}=$ENV{'form.f'.$i};
+ 		$fields{$keyfields[$i]}=$ENV{'form.f'.$i};
-       }
+ 	    }
+ 	} else {
+ 	    if ($ENV{'form.f'.$i} ne 'none') {
+ 		$fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+ 	    }
+ 	}
+     }
+     $request->print('<h3>Assigning Grades</h3>');
+     my $courseid=$ENV{'request.course.id'};
+     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("<br />Stored $countdone students\n");
+     if (@skipped) {
+ 	$request->print('<br /><font size="+1"><b>Skipped Students</b></font><br />');
+ 	foreach my $student (@skipped) { $request->print("<br />$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.='<form action="/adm/grades" method="post">'."\n".
+ 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ 	'<input type="hidden" name="url" value="'.$url.'" />'."\n".
+ 	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
+ 	'<input type="submit" name="submit" value="Grading Menu" />'."\n".
+ 	'</form>'."\n";
+     return $result;
+ }
+ #--- Displays the main menu page -------
+ sub gradingmenu {
+     my ($request) = @_;
+     my ($symb,$url)=&get_symb_and_url($request);
+     if (!$symb) {return '';}
+     my $result='<h3>&nbsp;<font color="#339933">Select a Grading Method</font></h3>';
+     $result.='<table border="0">';
+     $result.='<tr><td colspan=3><font size=+1><b>Resource: </b>'.$url.'</font></td></tr>';
+     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.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
+ 	    '<td><b>Type: </b>'.$responsetype.'</td>'.
+ 	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
+     }
+     $result.='</table>';
+     $result.=&view_edit_entire_class_form($symb,$url).'<br />';
+     $result.=&upcsvScores_form($symb,$url).'<br />';
+     $result.=&viewGradeaStu_form($symb,$url,$resptype,$hdgrade).'<br />';
+     $result.=&verifyReceipt_form($symb,$url)
+ 	if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb));
+     return $result;
+ }
+ #--- Menu for grading a section or the whole class ---
+ sub view_edit_entire_class_form {
+     my ($symb,$url)=@_;
+     my ($classlist,$sections,undef) = &getclasslist('all','0');
+     my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
+     $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
+     $result.='&nbsp;<b>Grade Entire Section or Class</b></td></tr>'."\n";
+     $result.='<tr bgcolor=#ffffe6><td>'."\n";
+     $result.='<form action="/adm/grades" method="post">'."\n".
+ 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ 	'<input type="hidden" name="url" value="'.$url.'" />'."\n".
+ 	'<input type="hidden" name="command" value="viewgrades" />'."\n";
+     $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";
+     if (ref($sections)) {
+ 	foreach (sort (@$sections)) {
+ 	    $result.= '<option>'.$_.'</option>'."\n";
+ 	}
+     }
+     $result.='<option selected="on">all</select>'."<br />\n";
+     $result.='&nbsp;<input type="button" onClick="submit();" value="Grade" /></form>'."\n";
+     $result.='</td></tr></table>'."\n";
+     $result.='</td></tr></table>'."\n";
+     return $result;
+ }
+ #--- Menu to upload a csv scores ---
+ sub upcsvScores_form {
+     my ($symb,$url) = @_;
+     if (!$symb) {return '';}
+     my $result = '<script type="text/javascript" language="javascript">'."\n".
+ 	'  function checkUpload(formname) {'."\n".
+ 	'    if (formname.upfile.value == "") {'."\n".
+ 	'       alert("Please use the browse button to select a file from your local directory.");'."\n".
+ 	'       return false;'."\n".
+ 	'    }'."\n".
+ 	'    formname.submit();'."\n".
+ 	'  }'."\n".
+ 	'</script>'."\n";
+     $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
+     $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
+     $result.='&nbsp;<b>Specify a file containing the class scores for above resource</b></td></tr>'."\n";
+     $result.='<tr bgcolor=#ffffe6><td>'."\n";
+     my $upfile_select=&Apache::loncommon::upfile_select_html();
+   $result.=<<ENDUPFORM;
+ <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
+ <input type="hidden" name="symb" value="$symb" />
+ <input type="hidden" name="url" value="$url" />
+ <input type="hidden" name="command" value="csvuploadmap" />
+ $upfile_select
+ <br />&nbsp;<input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Grades" />
+ </form>
+ ENDUPFORM
+     $result.='</td></tr></table>'."\n";
+     $result.='</td></tr></table>'."\n";
+     return $result;
+ }
+ #--- Handgrading problems ---
+ sub viewGradeaStu_form {
+     my ($symb,$url,$response,$handgrade) = @_;
+     my ($classlist,$sections) = &getclasslist('all','0');
+     my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
+     $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
+     $result.='&nbsp;<b>';
+     if ($handgrade eq 'yes') {
+ 	$result.="View/Grade ";
      } else {
-       if ($ENV{'form.f'.$i} ne 'none') {
+ 	$result.="View ";
- 	$fields{$ENV{'form.f'.$i}}=$keyfields[$i];
-       }
      }
-   }
+     $result.='an Individual Student\'s Submission</b></td></tr>'."\n";
-   $request->print('<h3>Assigning Grades</h3>');
+     $result.='<tr bgcolor=#ffffe6><td>'."\n";
-   my $courseid=$ENV{'request.course.id'};
+     $result.='<form action="/adm/grades" method="post">'."\n".
- #  my $cdom=$ENV{"course.$courseid.domain"};
+ 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
- #  my $cnum=$ENV{"course.$courseid.num"};
+ 	'<input type="hidden" name="url" value="'.$url.'" />'."\n".
-   my ($classlist) = &getclasslist('all','1');
+ 	'<input type="hidden" name="response" value="'.$response.'" />'."\n".
-   my @skipped;
+ 	'<input type="hidden" name="handgrade" value="'.$handgrade.'" />'."\n".
-   my $countdone=0;
+ 	'<input type="hidden" name="showgrading" value="yes" />'."\n".
-   foreach my $grade (@gradedata) {
+ 	'<input type="hidden" name="command" value="submission" />'."\n";
-     my %entries=&Apache::loncommon::record_sep($grade);
-     my $username=$entries{$fields{'username'}};
+     $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";
-     my $domain=$entries{$fields{'domain'}};
+     if (ref($sections)) {
-     if (!exists($$classlist{"$username:$domain"})) {
+ 	foreach (sort (@$sections)) {$result.='<option>'.$_.'</option>'."\n";}
-       push(@skipped,"$username:$domain");
+     }
-       next;
+     $result.= '<option selected="on">all</select>'."\n";
-     }
+     $result.='&nbsp;&nbsp;<b>Display students who has: </b>'.
-     my %grades;
+ 	'<input type="radio" name="submitonly" value="yes" checked> submitted'.
-     foreach my $dest (keys(%fields)) {
+ 	'<input type="radio" name="submitonly" value="all"> everybody <br />';
-       if ($dest eq 'username' || $dest eq 'domain') { next; }
+     if (ref($sections)) {
-       if ($entries{$fields{$dest}} eq '') { next; }
+ 	$result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />'
-       my $store_key=$dest;
+ 	    if (grep /no/,@$sections);
-       $store_key=~s/^stores/resource/;
+     }
-       $store_key=~s/_/\./g;
-       $grades{$store_key}=$entries{$fields{$dest}};
-     }
+     $result.='<br />&nbsp;<input type="button" onClick="submit();" value="';
-     $grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
+     if ($handgrade eq 'yes') {
-     &Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'},
+ 	$result.="View/Grade";
- 			    $domain,$username);
+     } else {
-     $request->print('.');
+ 	$result.="View";
-     $request->rflush();
+     }
-     $countdone++;
+     $result.='" />'."\n".'</form>'."\n";
-   }
+     $result.='</td></tr></table>'."\n";
-   $request->print("<br />Stored $countdone students\n");
+     $result.='</td></tr></table>'."\n";
-   if (@skipped) {
+     return $result;
-     $request->print('<br /><font size="+1"><b>Skipped Students</b></font><br />');
+ }
-     foreach my $student (@skipped) { $request->print("<br />$student"); }
-   }
+ #--- Form to input a receipt number ---
-   $request->print(&view_edit_entire_class_form($symb,$url));
+ sub verifyReceipt_form {
-   $request->print(&show_grading_menu_form($symb,$url));
+     my ($symb,$url) = @_;
-   return '';
+     my $result = '<script type="text/javascript" language="javascript">'."\n".
+ 	'  function checkEntry(formname) {'."\n".
+ 	'    var receipt = formname.receipt.value;'."\n".
+ 	'    if (isNaN(receipt) || receipt == "") {'."\n".
+ 	'       alert("Please enter a receipt number given by a student in the box.");'."\n".
+ 	'       return false;'."\n".
+ 	'    }'."\n".
+ 	'    formname.submit();'."\n".
+ 	'  }'."\n".
+ 	'</script>'."\n";
+     my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
+     $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
+     $result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n";
+     $result.='&nbsp;<b>Verify a Submission Receipt Issued by this Server</td></tr>'."\n";
+     $result.='<tr bgcolor=#ffffe6><td>'."\n";
+     $result.='<form action="/adm/grades" method="post" name="verifyform">'."\n";
+     $result.='&nbsp;<tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
+     $result.='&nbsp;<input type="button" onClick="javascript:checkEntry(this.form);"'.
+ 	' value="Verify Receipt">'."\n";
+     $result.='<input type="hidden" name="command" value="verify">'."\n";
+     if ($ENV{'form.url'}) {
+ 	$result.='<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />';
+     }
+     if ($ENV{'form.symb'}) {
+ 	$result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
+     }
+     $result.='</form>';
+     $result.='</td></tr></table>'."\n";
+     $result.='</td></tr></table>'."\n";
+     return $result;
+ }
+ sub handler {
+     my $request=$_[0];
+     if ($ENV{'browser.mathml'}) {
+ 	$request->content_type('text/xml');
+     } else {
+ 	$request->content_type('text/html');
+     }
+     $request->send_http_header;
+     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 '') {
+ 	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('<h3>Not authorized: '.$token.'</h3>');
+ 		    }
+ 		} else {
+ 		    $request->print('<h3>Not a valid DocID: '.$token.'</h3>');
+ 		}
+ 	    } else {
+ 		$request->print(&Apache::lonxml::tokeninputfield());
+ 	    }
+ 	}
+     } else {
+ 	$Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+ 	if ($command eq 'submission') {
+ 	    &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:");
+ 	}
+     }
+     &send_footer($request);
+     return '';
  }
  sub send_header {
-   my ($request)= @_;
+     my ($request)= @_;
-   $request->print(&Apache::lontexconvert::header());
+     $request->print(&Apache::lontexconvert::header());
  #  $request->print("
  #<script>
  #remotewindow=open('','homeworkremote');
  #remotewindow.close();
  #</script>");
-   $request->print('<body bgcolor="#FFFFFF">');
+     $request->print(&Apache::loncommon::bodytag('Grading'));
  }
  sub send_footer {
-   my ($request)= @_;
+     my ($request)= @_;
-   $request->print('</body>');
+     $request->print('</body>');
-   $request->print(&Apache::lontexconvert::footer());
+     $request->print(&Apache::lontexconvert::footer());
- }
- sub handler {
-   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;
-   &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 '') {
-      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('<h1>Not authorized: '.$token.'</h1>');
-                 }
- 	    } else {
-                 $request->print('<h1>Not a valid DocID: '.$token.'</h1>');
-             }
- 	 } else {
-              $request->print(&Apache::lonxml::tokeninputfield());
-          }
-      }
-   } else {
-     #&Apache::lonhomework::showhashsubset(\%ENV,'^form');
-     $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
-     if ($command eq 'submission') {
-       &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 'receiptInput') {
- #      &receiptInput($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:");
-     }
-   }
-   &send_footer($request);
-   return OK;
  }
 ;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.40
changed lines
	Added in v.1.57