--- loncom/interface/Attic/lonspreadsheet.pm	2002/12/09 16:06:56	1.157
+++ loncom/interface/Attic/lonspreadsheet.pm	2003/03/19 17:16:23	1.160.2.4
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.157 2002/12/09 16:06:56 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.160.2.4 2003/03/19 17:16:23 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -833,7 +833,7 @@ sub expandnamed {
             push @matches,$parameter if ($parameter =~ /$expression/);
         }
         if (scalar(@matches) == 0) {
-            $returnvalue = 'unmatched parameter: '.$parameter;
+            $returnvalue = undef; #'unmatched parameter: '.$parameter;
         } elsif (scalar(@matches) == 1) {
             $returnvalue = '$c{\''.$matches[0].'\'}';
         } elsif (scalar(@matches) > 0) {
@@ -961,7 +961,7 @@ ENDDEFS
 sub templaterow {
     my $sheet = shift;
     my @cols=();
-    my $rowlabel = 'Template';
+    my $rowlabel = 'Template</td><td>&nbsp;';
     foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
 	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
 	     'a','b','c','d','e','f','g','h','i','j','k','l','m',
@@ -989,8 +989,10 @@ sub outrowassess {
         } else { 
             $rowlabel = '';
         }
+    } elsif ($ENV{'request.role'} =~ /^st\./) {
+        $rowlabel = 'Summary</td><td>0';
     } else {
-        $rowlabel = 'Export';
+        $rowlabel = 'Export</td><td>0';
     }
     foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
 	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
@@ -1011,9 +1013,9 @@ sub outrow {
         $rowlabel = $sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}};
     } else {
         if ($sheet->{'sheettype'} eq 'classcalc') {
-            $rowlabel = 'Summary';
+            $rowlabel = 'Summary</td><td>0';
         } else {
-            $rowlabel = 'Export';
+            $rowlabel = 'Export</td><td>0';
         }
     }
     foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
@@ -1259,7 +1261,7 @@ sub html_editable_cell {
     } elsif ($value =~ /^\s*$/ ) {
         $value = '<font color="'.$bgcolor.'">#</font>';
     } else {
-        $value = &HTML::Entities::encode($value);
+        $value = &HTML::Entities::encode($value) if ($value !~/&nbsp;/);
     }
     # Make the formula safe for outputting
     $formula =~ s/\'/\"/g;
@@ -1277,7 +1279,7 @@ sub html_editable_cell {
 sub html_uneditable_cell {
     my ($cell,$bgcolor) = @_;
     my $value = (defined($cell) ? $cell->{'value'} : '');
-    $value = &HTML::Entities::encode($value);
+    $value = &HTML::Entities::encode($value) if ($value !~/&nbsp;/);
     return '&nbsp;'.$value.'&nbsp;';
 }
 
@@ -1307,7 +1309,7 @@ sub outsheet_html  {
     my $tabledata =<<"END";
 <table border="2">
 <tr>
-  <th colspan="1" rowspan="2"><font size="+2">$realm</font></th>
+  <th colspan="2" rowspan="2"><font size="+2">$realm</font></th>
   <td bgcolor="#FFDDDD" colspan="$num_uneditable">
       <b><font size="+1">Import</font></b></td>
   <td colspan="$num_left">
@@ -1353,7 +1355,7 @@ END
     # Print out summary/export row
     ####################################
     ($rowlabel,@rowdata) = &get_row($sheet,'0');
-    $row_html = '<tr><td>'.&format_html_rowlabel($sheet,'Summary').'</td>';
+    $row_html = '<tr><td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>';
     $num_cols_output = 0;
     foreach my $cell (@rowdata) {
         if ($num_cols_output++ < 26 && ! $requester_is_student) {
@@ -1880,6 +1882,14 @@ sub makenewsheet {
     $sheet->{'mapid'} = $ENV{'form.mapid'};
     $sheet->{'resid'} = $ENV{'form.resid'};
     $sheet->{'cid'}   = $ENV{'request.course.id'};
+    if (! exists($Section{$uname.':'.$udom})) {
+        my $classlist = &Apache::loncoursedata::get_classlist();
+        foreach my $student (keys(%$classlist)) {
+            my ($studentDomain,$studentName,undef,undef,undef,$studentSection,
+                undef,undef)   =   @{$classlist->{$student}};
+            $Section{$studentName.':'.$studentDomain} = $studentSection;
+        }
+    }
     $sheet->{'csec'}  = $Section{$uname.':'.$udom};
     $sheet->{'coursefilename'}   = $ENV{'request.course.fn'};
     $sheet->{'cnum'}  = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
@@ -2092,8 +2102,27 @@ sub parmval {
     # second, check map parms
     my $thisparm = $parmhash{$symbparm};
     return $thisparm if (defined($thisparm));
+
     # first, check default
-    return &Apache::lonnet::metadata($fn,$rwhat.'.default');
+    $thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default');
+    return $thisparm if (defined($thisparm));
+
+    #Cascade Up
+    my $space=$what;
+    $space=~s/\.\w+$//;
+    if ($space ne '0') {
+	my @parts=split(/_/,$space);
+	my $id=pop(@parts);
+	my $part=join('_',@parts);
+	if ($part eq '') { $part='0'; }
+	my $newwhat=$rwhat;
+	$newwhat=~s/\Q$space\E/$part/;
+	my $partgeneral=&parmval($newwhat,$sheet);
+	if (defined($partgeneral)) { return $partgeneral; }
+    }
+
+    #nothing defined
+    return '';
 }
 
 
@@ -2389,7 +2418,7 @@ sub updatestudentassesssheet {
         unless ((exists($sheet->{'rowlabel'}->{$usy}) && 
                  (defined($sheet->{'rowlabel'}->{$usy})) || (!$1) ||
                  ($formula =~ /^(~~~|---)/) )) {
-            $f{$_}='!!! Obsolete';
+            $f{$cell}='!!! Obsolete';
             $changed=1;
         }
     }
@@ -2913,7 +2942,8 @@ sub cachedssheets {
     $uname = $uname || $sheet->{'uname'};
     $udom  = $udom  || $sheet->{'udom'};
     if (! $loadedcaches{$uname.'_'.$udom}) {
-        my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
+        my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets_'.
+                                        $ENV{'request.course.id'},
                                         $sheet->{'udom'},
                                         $sheet->{'uname'});
         if ($tmp[0] !~ /^error/) {
@@ -3005,9 +3035,9 @@ sub handler {
                                              $ENV{'form.ufn'} eq 'default')) {
         $ENV{'form.ufn'}='default_'.$1;
     }
-    if (!$ENV{'form.ufn'} || $ENV{'form.ufn'} eq 'default') {
-        $ENV{'form.ufn'}='course_default_'.$sheettype;
-    }
+#    if (!$ENV{'form.ufn'} || $ENV{'form.ufn'} eq 'default') {
+#        $ENV{'form.ufn'}='course_default_'.$sheettype;
+#    }
     #
     # Interactive loading of specific sheet?
     #
@@ -3209,6 +3239,7 @@ ENDSCRIPT
         $oldsheets{'course'} ne $sheet->{'cid'}) {
         undef %oldsheets;
         undef %loadedcaches;
+        undef %Section;
     }
     $oldsheets{'course'} = $sheet->{'cid'};
     #
@@ -3275,8 +3306,8 @@ ENDSCRIPT
     }
     $r->print('>');
     #
-    # CSV format checkbox (classcalc sheets only)
-    $r->print(' Output as <select name="output" size="1" onClick="submit()">'.
+    # output format select box 
+    $r->print(' Output as <select name="output" size="1" onChange="submit()">'.
               "\n");
     foreach my $mode (qw/HTML CSV Excel/) {
         $r->print('<option value="'.$mode.'"');