--- loncom/interface/spreadsheet/studentcalc.pm	2005/08/05 20:06:22	1.34
+++ loncom/interface/spreadsheet/studentcalc.pm	2006/04/06 16:43:49	1.37
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.34 2005/08/05 20:06:22 albertel Exp $
+# $Id: studentcalc.pm,v 1.37 2006/04/06 16:43:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -271,8 +271,17 @@ END
     }
     foreach my $Sequence (@Sequences) {
 	$r->print("<h3>".$Sequence->compTitle."</h3>\n");
+
+        my @resources = &get_resources($Sequence);
+        my $first_rownum =
+            $self->get_row_number_from_key($resources[0]->symb);
+        my $last_rownum = 
+            $self->get_row_number_from_key($resources[-1]->symb);
+        $r->print(&assess_file_selector([$first_rownum, $last_rownum],
+                                        undef, \@AssessFileNames));
+
  	$r->print($tableheader);
-	foreach my $resource (&get_resources($Sequence)) {
+	foreach my $resource (@resources) {
 	    my $rownum = $self->get_row_number_from_key($resource->symb);
             my $assess_filename = $self->{'row_source'}->{$rownum};
             my $row_output = '<tr>';
@@ -328,12 +337,25 @@ sub assess_file_selector {
         return '';
     }
     return '' if (! &Apache::lonnet::allowed('mgr',$env{'request.course.id'}));
-    my $element_name = 'FileSelect_'.$row;
+    my $element_name;
+    my $source_row = $row;
+    if (ref($row)) {
+        my ($first_rownum, $last_rownum) = @$row;
+        $element_name = "FileSelect_${first_rownum}_${last_rownum}";
+        $source_row = "${first_rownum}:${last_rownum}";
+    } else {
+        $element_name = 'FileSelect_'.$row;
+    }
     my $load_dialog = '<select size="1" name="'.$element_name.'" '.
         'onchange="'.
-        "document.sheet.cell.value='source_$row';".
+        "document.sheet.cell.value='source_${source_row}';".
         "document.sheet.newformula.value=document.sheet.$element_name\.value;".
         'document.sheet.submit()" '.'>'."\n";
+    if (ref($row)) {
+        $load_dialog .= '    <option name="" value="">' .
+            &mt("Select spreadsheet for entire sequence")
+            . "</option>\n";
+    }
     foreach my $file (@{$AssessFiles}) {
         $load_dialog .= '    <option name="'.$file.'"';
         $load_dialog .= ' selected' if ($default eq $file);
@@ -346,22 +368,36 @@ sub assess_file_selector {
 sub modify_cell {
     my $self = shift;
     my ($cell,$formula) = @_;
-    if ($cell =~ /^source_(\d+)$/) {
-        # Need to make sure $formula is a valid filename....
-        my $row = $1;
-        $cell = 'A'.$row;
+
+    my $set_row = sub {
+        my $row = shift;
+        my $formula = shift;
+        my $cell = 'A' . $row;
         $self->{'row_source'}->{$row} = $formula;
         my $original_source = $self->formula($cell);
         if ($original_source =~ /__&&&__/) {
             ($original_source,undef) = split('__&&&__',$original_source);
         }
         $formula = $original_source.'__&&&__'.$formula;
+        $self->set_formula($cell,$formula);
+    };
+
+    if ($cell =~ /^source_(\d+):(\d+)$/) {
+        my $first_row = $1;
+        my $last_row = $2;
+        for my $row ($first_row..$last_row) {
+            $set_row->($row, $formula);
+        }
+    } elsif ($cell =~ /^source_(\d+)$/) {
+        # Need to make sure $formula is a valid filename....
+        my $row = $1;
+        $set_row->($row, $formula);
     } elsif ($cell =~ /([A-z])\-/) {
         $cell = 'template_'.$1;
+        $self->set_formula($cell,$formula);
     } elsif ($cell !~ /^([A-z](\d+)|template_[A-z])$/) {
         return;
     }
-    $self->set_formula($cell,$formula);
     $self->rebuild_stats();
     return;
 }
@@ -534,7 +570,8 @@ sub compute {
                 $assessSheet = Apache::assesscalc->new($self->{'name'},
                                                        $self->{'domain'},
                                                        $assess_filename,
-                                                       $resource->symb);
+                                                       $resource->symb,
+						       $self->{'section'});
             my @exportdata = $assessSheet->export_data($r);
             #
             if ($assessSheet->badcalc()) {
@@ -585,6 +622,7 @@ sub compute {
 
 sub set_row_sources {
     my $self = shift;
+    $self->check_formulas_loaded();
     while (my ($cell,$value) = each(%{$self->{'formulas'}})) {
         next if ($cell !~ /^A(\d+)$/ || $1 < 1);
         my $row = $1;
@@ -597,6 +635,7 @@ sub set_row_sources {
 
 sub set_row_numbers {
     my $self = shift;
+    $self->check_formulas_loaded();
     while (my ($cell,$formula) = each(%{$self->{'formulas'}})) {
         next if ($cell !~ /^A(\d+)/);
         my $row = $1;