--- loncom/interface/spreadsheet/studentcalc.pm	2006/03/26 22:48:34	1.36
+++ loncom/interface/spreadsheet/studentcalc.pm	2010/06/14 01:30:54	1.45
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.36 2006/03/26 22:48:34 bowersj2 Exp $
+# $Id: studentcalc.pm,v 1.45 2010/06/14 01:30:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,6 +59,8 @@ use Apache::assesscalc();
 use HTML::Entities();
 use Time::HiRes;
 use Apache::lonlocal;
+use LONCAPA;
+ 
 
 @Apache::studentcalc::ISA = ('Apache::Spreadsheet');
 
@@ -98,11 +100,15 @@ sub initialize_sequence_cache {
     }
     my @all_sequences = $navmap->retrieveResources(undef,
                                                sub { shift->is_map(); },1,0,1);
-    for my $sequence ($navmap->getById('0.0'), @all_sequences) {
-	if ($navmap->hasResource($sequence,sub { shift->is_problem(); }, 0)){
-            push(@Sequences,$sequence);
-	    &get_resources($sequence);
-        }
+    my $toplevelseq = $navmap->getById('0.0');
+    if (!grep(/^\Q$toplevelseq\E$/,@all_sequences)) {
+         unshift(@all_sequences,$toplevelseq);
+    }
+    foreach my $sequence (@all_sequences) {
+       if ($navmap->hasResource($sequence,sub { shift->is_problem(); }, 0,1)){
+           push(@Sequences,$sequence);
+           &get_resources($sequence);
+       }
     }
 }
 
@@ -115,7 +121,7 @@ sub get_resources {
     return () if (! defined($navmap) || ! ref($navmap));
     my @resources = $navmap->retrieveResources($seq,
                                                sub { shift->is_problem(); },
-                                               0,0,0);
+                                               0,0,1);
     $res_memoize{$seq->symb()}=\@resources;
     return @resources;
 }
@@ -221,16 +227,16 @@ END
     }
     $tableheader .="</tr>\n";
     if ($self->blackout()) {
-        $r->print('<font color="red" size="+2"><p>'.
+        $r->print('<p class="LC_warning">'.
                   &mt('Some computations are not available at this time.').'<br />'.
                   &mt('There are problems whose status you are not allowed to view.').
-                  '</font></p>'."\n");
+                  '</p>'."\n");
     } else {
         $r->print($tableheader);
         #
         # Print out template row
         if (exists($env{'request.role.adv'}) && $env{'request.role.adv'}) {
-            $r->print('<tr><td>Template</td><td>&nbsp;</td>'.
+            $r->print('<tr><td>'.&mt('Template').'</td><td>&nbsp;</td>'.
                       $self->html_template_row($num_uneditable,
                                                $importcolor)."</tr>\n");
         }
@@ -292,7 +298,7 @@ END
                     '<a href="/adm/assesscalc?sname='.$self->{'name'}.
                     '&sdomain='.$self->{'domain'}.
                     '&filename='.$assess_filename.
-                    '&usymb='.&Apache::lonnet::escape($resource->symb).
+                    '&usymb='.&escape($resource->symb).
                     '">'.$resource->compTitle.'</a><br />';
                 $row_output .= &assess_file_selector($rownum,
                                                      $assess_filename,
@@ -300,7 +306,7 @@ END
                                                          '</td>';
             } else {
                 $row_output .= '<td><a href="'.$resource->src.'?symb='.
-                    &Apache::lonnet::escape($resource->symb).
+                    &escape($resource->symb).
                     '">Go&nbsp;To</a>';
                 $row_output .= '</td><td>'.$resource->compTitle.'</td>';
             }
@@ -397,6 +403,8 @@ sub modify_cell {
         $self->set_formula($cell,$formula);
     } elsif ($cell !~ /^([A-z](\d+)|template_[A-z])$/) {
         return;
+    } else {
+        $self->set_formula($cell,$formula);
     }
     $self->rebuild_stats();
     return;
@@ -549,7 +557,7 @@ sub compute {
     }
     $self->initialize_safe_space();
     &Apache::assesscalc::initialize_package($self->{'name'},$self->{'domain'},
-                                            $navmap);
+                                            $navmap,$self);
     my %f = $self->formulas();
     #
     # Process the formulas list - 
@@ -570,7 +578,9 @@ sub compute {
                 $assessSheet = Apache::assesscalc->new($self->{'name'},
                                                        $self->{'domain'},
                                                        $assess_filename,
-                                                       $resource->symb);
+                                                       $resource->symb,
+						       $self->{'section'},
+                                                       $self->{'groups'});
             my @exportdata = $assessSheet->export_data($r);
             #
             if ($assessSheet->badcalc()) {