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

raeburn raeburn@source.lon-capa.org
Sat, 18 Dec 2010 23:53:58 -0000


raeburn		Sat Dec 18 23:53:58 2010 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - When using new Question Type - randomizetry
    order of foils used for previous tries display is stored via
    resource.patrtiID.foilorder key.
    - Don't display key in submission displays in grading screen.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.988 loncom/interface/loncommon.pm:1.989
--- loncom/interface/loncommon.pm:1.988	Thu Dec 16 16:01:14 2010
+++ loncom/interface/loncommon.pm	Sat Dec 18 23:53:57 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.988 2010/12/16 16:01:14 raeburn Exp $
+# $Id: loncommon.pm,v 1.989 2010/12/18 23:53:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3421,6 +3421,7 @@
 	my ($ign,@parts) = split(/\./,$key);
 	if ($#parts > 0) {
 	  my $data=$parts[-1];
+          next if ($data eq 'foilorder');
 	  pop(@parts);
           if ($data eq 'type') {
               unless ($showsurv) {
@@ -3457,6 +3458,7 @@
                            '<td>'.&mt('Transaction [_1]',$version).'</td>';
             if (@hidden) {
                 foreach my $key (sort(keys(%lasthash))) {
+                    next if ($key =~ /\.foilorder$/);
                     my $hide;
                     foreach my $id (@hidden) {
                         if ($key =~ /^\Q$id\E/) {
@@ -3485,6 +3487,7 @@
                 }
             } else {
 	        foreach my $key (sort(keys(%lasthash))) {
+                    next if ($key =~ /\.foilorder$/);
 		    my $value = &format_previous_attempt_value($key,
 			            $returnhash{$version.':'.$key});
 		    $prevattempts.='<td>'.$value.'&nbsp;</td>';
@@ -3496,6 +3499,7 @@
       my @currhidden = keys(%lasthidden);
       $prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';
       foreach my $key (sort(keys(%lasthash))) {
+          next if ($key =~ /\.foilorder$/);
           if (%typeparts) {
               my $hidden;
               foreach my $id (@currhidden) {