[LON-CAPA-cvs] cvs: loncom /homework inputtags.pm /interface loncommon.pm

[www]

www		Mon Jun  6 21:26:00 2011 EDT

  Modified files:              
    /loncom/homework	inputtags.pm 
    /loncom/interface	loncommon.pm 
  Log:
  Bug #6476: Save "type"
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.287 loncom/homework/inputtags.pm:1.288
--- loncom/homework/inputtags.pm:1.287	Mon Jun  6 18:55:54 2011
+++ loncom/homework/inputtags.pm	Mon Jun  6 21:25:54 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.287 2011/06/06 18:55:54 www Exp $
+# $Id: inputtags.pm,v 1.288 2011/06/06 21:25:54 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1320,11 +1320,7 @@
     if ($award eq 'SUBMITTED') {
 	&Apache::response::add_to_gradingqueue();
     }
-    if (($Apache::lonhomework::type eq 'anonsurvey') ||
-        ($Apache::lonhomework::type eq 'anonsurveycred') || 
-        ($Apache::lonhomework::type eq 'randomizetry')) {
-        $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
-    }
+    $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
 }
 
 sub find_which_previous {
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1009 loncom/interface/loncommon.pm:1.1010
--- loncom/interface/loncommon.pm:1.1009	Sun Jun  5 12:59:47 2011
+++ loncom/interface/loncommon.pm	Mon Jun  6 21:25:59 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1009 2011/06/05 12:59:47 www Exp $
+# $Id: loncommon.pm,v 1.1010 2011/06/06 21:25:59 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3459,6 +3459,7 @@
 	  my $data=$parts[-1];
           next if ($data eq 'foilorder');
 	  pop(@parts);
+          $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
           if ($data eq 'type') {
               unless ($showsurv) {
                   my $id = join(',',@parts);
@@ -3467,10 +3468,7 @@
                       $lasthidden{$ign.'.'.$id} = 1;
                   }
               }
-              delete($lasthash{$key});
-          } else {
-	      $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
-          }
+          } 
 	} else {
 	  if ($#parts == 0) {
 	    $prevattempts.='<th>'.$parts[0].'</th>';