--- loncom/homework/grades.pm	2001/04/16 23:34:11	1.5
+++ loncom/homework/grades.pm	2001/07/26 15:50:25	1.9
@@ -1,5 +1,6 @@
 # The LON-CAPA Grading handler
 # 2/9,2/13 Guy Albertelli
+# 6/8 Gerd Kortemeyer
 
 package Apache::grades;
 use strict;
@@ -26,12 +27,22 @@ sub moreinfo {
 }
 
 
-#FIXME - needs to be much smarter
+#FIXME - needs to handle multiple matches
 sub finduser {
   my ($name) = @_;
+  my $domain = '';
 
   if ( $Apache::grades::viewgrades eq 'F' ) {
-    return ($name,$ENV{'user.domain'});
+    #get classlist
+    my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+    my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
+    #print "Found $cdom:$cnum:$chome<br />";
+    my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+    foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+      my ($posname,$posdomain) = split(/:/,$student);
+      if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
+    }
+    return ($name,$domain);
   } else {
     return ($ENV{'user.name'},$ENV{'user.domain'});
   }
@@ -60,7 +71,9 @@ sub getpartlist {
   my @parts =();
   my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
   foreach my $key (@metakeys) {
-    if ( $key =~ m/stores_([0-9]+)_.*/ ) { push(@parts,$key); }
+    if ( $key =~ m/stores_([0-9]+)_.*/ ) {
+      push(@parts,$key);
+    }
   }
   return @parts;
 }
@@ -71,8 +84,7 @@ sub viewstudentgrade {
 
   my ($stuname,$domain) = split(/:/,$student);
 
-  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname,
-				      &Apache::lonnet::homeserver($stuname,$domain));
+  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
 
   $result.="<tr><td>$stuname</td><td>$domain</td>\n";
   foreach my $part (@parts) {
@@ -80,23 +92,23 @@ sub viewstudentgrade {
     #print "resource.$part.$type = ".$record{"resource.$part.$type"}." <br />\n";
     if ($type eq 'awarded') {
       my $score=$record{"resource.$part.$type"};
-      $result.="<td><input type=\"text\" name=\"GRADE.$stuname.$part.$type\" value=\"$score\" size=\"4\" /></td>\n";
+      $result.="<td><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n";
     } elsif ($type eq 'tries') {
       my $score=$record{"resource.$part.$type"};
-      $result.="<td><input type=\"text\" name=\"GRADE.$stuname.$part.$type\" value=\"$score\" size=\"4\" /></td>\n"
+      $result.="<td><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n"
     } elsif ($type eq 'solved') {
       my $score=$record{"resource.$part.$type"};
-      $result.="<td><select name=\"GRADE.$stuname.$part.$type\">\n";
+      $result.="<td><select name=\"GRADE.$student.$part.$type\">\n";
       if ($score =~ /^correct/) {
-	$result.="<option selected=\"on\">Correct</option>\n<option>Incorrect</option>\n<option>Excused</option>\n<option>Attempted</option>\n<option>Nothing</option>\n";
+	$result.="<option selected=\"on\">correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
       } elsif ($score =~ /^incorrect/) {
-	$result.="<option>Correct</option>\n<option selected=\"on\">Incorrect</option>\n<option>Excused</option>\n<option>Attempted</option>\n<option>Nothing</option>\n";
+	$result.="<option>correct</option>\n<option selected=\"on\">incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
       } elsif ($score eq '') {
-	$result.="<option>Correct</option>\n<option>Incorrect</option>\n<option>Excused</option>\n<option>Attempted</option>\n<option selected=\"on\">Nothing</option>\n";
+	$result.="<option>correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option selected=\"on\">nothing</option>\n";
       } elsif ($score =~ /^excused/) {
-	$result.="<option>Correct</option>\n<option>Incorrect</option>\n<option selected=\"on\">Excused</option>\n<option>Attempted</option>\n<option>Nothing</option>\n";
+	$result.="<option>correct</option>\n<option>incorrect</option>\n<option selected=\"on\">excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
       } elsif ($score =~ /^ungraded/) {
-	$result.="<option>Correct</option>\n<option>Incorrect</option>\n<option>Excused</option>\n<option selected=\"on\">Attempted</option>\n<option>Nothing</option>\n";
+	$result.="<option>correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option selected=\"on\">ungraded</option>\n<option>nothing</option>\n";
       }
       $result.="</select></td>\n";
     }
@@ -104,27 +116,55 @@ sub viewstudentgrade {
   $result.='</tr>';
   return $result;
 }
-
+#FIXME need to look at the meatdata <stores> spec on what type of data to accept and provide an
+#interface based on that, also do that to above function.
 sub setstudentgrade {
   my ($url,$symb,$courseid,$student,@parts) = @_;
 
-  my $result ='Hi!';
+  my $result ='';
 
   my ($stuname,$domain) = split(/:/,$student);
 
-  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname,
-				      &Apache::lonnet::homeserver($stuname,$domain));
+  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
+
   my %newrecord;
+
   foreach my $part (@parts) {
     my ($temp,$part,$type)=split(/_/,$part);
     my $oldscore=$record{"resource.$part.$type"};
-    my $newscore=$ENV{"GRADE.$stuname.$part.$type"};
-    if ($oldscore != $newscore) {
-      $result.="$stuname:$part:$type:changed from $oldscore to $newscore:<br />\n";
+    my $newscore=$ENV{"form.GRADE.$student.$part.$type"};
+    if ($type eq 'solved') {
+      my $update=0;
+      if ($newscore eq 'nothing' ) {
+	if ($oldscore ne '') {
+	  $update=1;
+	  $newscore = '';
+	}
+      } elsif ($oldscore !~ m/^$newscore/) {
+	$update=1;
+	$result.="Updating $stuname to $newscore<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'; }
+      } else {
+	#$result.="$stuname:$part:$type:unchanged  $oldscore to $newscore:<br />\n";
+      }
+      if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }
     } else {
-      $result.="$stuname:$part:$type:changed same $oldscore to $newscore:<br />\n";
+      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";
+      }
     }
   }
+  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;
 }
 
@@ -137,8 +177,7 @@ sub submission {
   if ($uname eq '') { &moreinfo($request,"Unable to find student"); return ''; }
   my $symb=&Apache::lonnet::symbread($url);
   if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
-  my $home=&Apache::lonnet::homeserver($uname,$udom);
-  my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,$home,
+  my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
 						      $ENV{'request.course.id'});
   my $result="<h2> Submission Record </h2>  $uname:$udom for $url".$answer;
   return $result;
@@ -167,12 +206,18 @@ sub viewgrades {
 
   #start the form
   $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="symb" value="'.$symb.'"/>'."\n".
+      '<input type="hidden" name="url" value="'.$url.'"/>'."\n".
 	'<input type="hidden" name="command" value="editgrades" />'."\n".
 	  '<input type="submit" name="submit" value="Submit Changes" />'."\n".
 	    '<table>'."\n".
-	      '<tr><td>UserId</td><td>Domain</td><td>Portion Correct</td><td>Status</td><td>Tries</td></tr>'."\n";
+	      '<tr><td>UserId</td><td>Domain</td>'."\n";
+  foreach my $part (@parts) {
+     my $display=&Apache::lonnet::metadata($url,$part.'.display');
+     if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
+     $result.="<td>$display</td>\n";
+   }
+  $result.="</tr>";
   #get info for each student
   foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
     $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
@@ -189,7 +234,6 @@ sub editgrades {
   my $symb=$ENV{'form.symb'};
   if ($symb eq '') { $request->print("Unable to handle ambiguous references:$symb:$ENV{'form.url'}"); return ''; }
   my $url=$ENV{'form.url'};
-
   #get classlist
   my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
   my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
@@ -203,7 +247,7 @@ sub editgrades {
     '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
       '<input type="hidden" name="url" value="'.$url.'" />'."\n".
 	'<input type="hidden" name="command" value="viewgrades" />'."\n".
-	  '<input type="submit" name="submit" value="See Grades" />'."\n";
+	  '<input type="submit" name="submit" value="See Grades" /> <br />'."\n";
 
   foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
     $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
@@ -216,11 +260,11 @@ sub editgrades {
 sub send_header {
   my ($request)= @_;
   $request->print(&Apache::lontexconvert::header());
-  $request->print("
-<script>
-remotewindow=open('','homeworkremote');
-remotewindow.close();
-</script>"); 
+#  $request->print("
+#<script>
+#remotewindow=open('','homeworkremote');
+#remotewindow.close();
+#</script>"); 
   $request->print('<body bgcolor="#FFFFFF">');
 }