--- loncom/interface/Attic/lonspreadsheet.pm	2002/12/03 10:04:21	1.153
+++ loncom/interface/Attic/lonspreadsheet.pm	2003/03/14 21:36:42	1.160.2.2
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.153 2002/12/03 10:04:21 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.160.2.2 2003/03/14 21:36:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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',
@@ -981,12 +981,18 @@ sub outrowassess {
     if ($n) {
         my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n});
         if (exists($sheet->{'rowlabel'}->{$usy})) {
-            $rowlabel = $sheet->{'rowlabel'}->{$usy};
+            # This is dumb, but we need the information when we output
+            # the html version of the studentcalc spreadsheet for the
+            # links to the assesscalc sheets.
+            $rowlabel = $sheet->{'rowlabel'}->{$usy}.':'.
+                &Apache::lonnet::escape($ufn);
         } 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',
@@ -1007,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',
@@ -1198,9 +1204,13 @@ sub sort_indicies {
         my @sortby2=(undef);
         # Skip row 0
         for (my $row=1;$row<=$sheet->{'maxrow'};$row++) {
-            my (undef,$symb,$uname,$udom,$mapid,$resid,$title) = 
-                split(':',$sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$row}});
-            $symb = &Apache::lonnet::unescape($symb);
+            my ($key,undef) = split(/__&&&\__/,$sheet->{'f'}->{'A'.$row});
+            my $rowlabel = $sheet->{'rowlabel'}->{$key};
+            my (undef,$symb,$mapid,$resid,$title,$ufn) = 
+                split(':',$rowlabel);
+            $ufn   = &Apache::lonnet::unescape($ufn);
+            $symb  = &Apache::lonnet::unescape($symb);
+            $title = &Apache::lonnet::unescape($title);
             my ($sequence) = ($symb =~ /\/([^\/]*\.sequence)/);
             if ($sequence eq '') {
                 $sequence = $symb;
@@ -1251,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;
@@ -1269,13 +1279,14 @@ 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;';
 }
 
 sub outsheet_html  {
     my ($sheet,$r) = @_;
     my ($num_uneditable,$realm,$row_type);
+    my $requester_is_student = ($ENV{'request.role'} =~ /^st\./);
     if ($sheet->{'sheettype'} eq 'assesscalc') {
         $num_uneditable = 1;
         $realm = 'Assessment';
@@ -1298,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">
@@ -1320,21 +1331,26 @@ END
     ####################################
     # Print out template row
     ####################################
-    my ($rowlabel,@rowdata) = &get_row($sheet,'-');
-    my $row_html = '<tr><td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>';
-    my $num_cols_output = 0;
-    foreach my $cell (@rowdata) {
-        if ($num_cols_output++ < $num_uneditable) {
-            $row_html .= '<td bgcolor="#FFDDDD">';
-            $row_html .= &html_uneditable_cell($cell,'#FFDDDD');
-        } else {
-            $row_html .= '<td bgcolor="#EOFFDD">';
-            $row_html .= &html_editable_cell($cell,'#E0FFDD');
+    my ($num_cols_output,$row_html,$rowlabel,@rowdata);
+    
+    if (! $requester_is_student) {
+        ($rowlabel,@rowdata) = &get_row($sheet,'-');
+        $row_html = '<tr><td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>';
+        $num_cols_output = 0;
+        foreach my $cell (@rowdata) {
+            if ($requester_is_student || 
+                $num_cols_output++ < $num_uneditable) {
+                $row_html .= '<td bgcolor="#FFDDDD">';
+                $row_html .= &html_uneditable_cell($cell,'#FFDDDD');
+            } else {
+                $row_html .= '<td bgcolor="#EOFFDD">';
+                $row_html .= &html_editable_cell($cell,'#E0FFDD');
+            }
+            $row_html .= '</td>';
         }
-        $row_html .= '</td>';
+        $row_html.= "</tr>\n";
+        $r->print($row_html);
     }
-    $row_html.= "</tr>\n";
-    $r->print($row_html);
     ####################################
     # Print out summary/export row
     ####################################
@@ -1342,12 +1358,12 @@ END
     $row_html = '<tr><td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>';
     $num_cols_output = 0;
     foreach my $cell (@rowdata) {
-        if ($num_cols_output++ < 26) {
+        if ($num_cols_output++ < 26 && ! $requester_is_student) {
             $row_html .= '<td bgcolor="#CCCCFF">';
             $row_html .= &html_editable_cell($cell,'#CCCCFF');
         } else {
             $row_html .= '<td bgcolor="#DDCCFF">';
-            $row_html .= &html_uneditable_cell(undef,'#CCCCFF');
+            $row_html .= &html_uneditable_cell($cell,'#CCCCFF');
         }
         $row_html .= '</td>';
     }
@@ -1387,18 +1403,21 @@ END
         if ($sheet->{'sheettype'} eq 'classcalc') {
             $row_html.='<td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>';
             # Output links for each student?
-            # Nope, that is already done for us in format_html_rowlabel (for now)
+            # Nope, that is already done for us in format_html_rowlabel 
+            # (for now)
         } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+            my $ufn = (split(/:/,$rowlabel))[5];
             $row_html.='<td>'.&format_html_rowlabel($sheet,$rowlabel);
             $row_html.= '<br>'.
                 '<select name="sel_'.$rownum.'" '.
                     'onChange="changesheet('.$rownum.')">'.
                         '<option name="default">Default</option>';
+
             foreach (@{$sheet->{'othersheets'}}) {
                 $row_html.='<option name="'.$_.'"';
-                #if ($ufn eq $_) {
-                #    $row_html.=' selected';
-                #}
+                if ($ufn eq $_) {
+                    $row_html.=' selected';
+                }
                 $row_html.='>'.$_.'</option>';
             }
             $row_html.='</select></td>';
@@ -1421,7 +1440,7 @@ END
             $bgcolor='#FFDDDD' if ($shown_cells < $num_uneditable);
             #
             $row_html.='<td bgcolor='.$bgcolor.'>';
-            if ($shown_cells < $num_uneditable) {
+            if ($requester_is_student || $shown_cells < $num_uneditable) {
                 $row_html .= &html_uneditable_cell($cell,$bgcolor);
             } else {
                 $row_html .= &html_editable_cell($cell,$bgcolor);
@@ -1822,13 +1841,27 @@ sub readsheet {
             }
             %f=%{&parse_sheet(\$sheetxml)};
         } else {
-            my $sheet='';
             my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum);
             my ($tmp) = keys(%tmphash);
-            unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+            if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
                 foreach (keys(%tmphash)) {
                     $f{$_}=$tmphash{$_};
                 }
+            } else {
+                # Unable to grab the specified spreadsheet,
+                # so we get the default ones instead.
+                $fn = 'default_'.$stype;
+                $sheet->{'filename'} = $fn;
+                my $dfn = $fn;
+                $dfn =~ s/\_/\./g;
+                my $sheetxml;
+                if (my $fh=Apache::File->new($includedir.'/'.$dfn)) {
+                    $sheetxml = join('',<$fh>);
+                } else {
+                    $sheetxml='<field row="0" col="A">'.
+                        '"Unable to load spreadsheet"</field>';
+                }
+                %f=%{&parse_sheet(\$sheetxml)};
             }
         }
         # Cache and set
@@ -1849,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'};
@@ -1902,9 +1943,16 @@ sub writesheet {
                                           $cdom,$cnum);
             if ($reply eq 'ok') {
                 if ($makedef) { 
-                    return &Apache::lonnet::put('environment',
-                                  {'spreadsheet_default_'.$stype => $fn },
-                                                $cdom,$cnum);
+                    $reply = &Apache::lonnet::put('environment',
+                                    {'spreadsheet_default_'.$stype => $fn },
+                                                  $cdom,$cnum);
+                    if ($reply eq 'ok' && 
+                        ($sheet->{'sheettype'} eq 'studentcalc' ||
+                         $sheet->{'sheettype'} eq 'assesscalc')) {
+                        # Expire the spreadsheets of the other students.
+                        &Apache::lonnet::expirespread('','','studentcalc','');
+                    }
+                    return $reply;
                 } 
                 return $reply;
             } 
@@ -2054,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,$symb,$uname,$udom,$csec);
+	if (defined($partgeneral)) { return $partgeneral; }
+    }
+
+    #nothing defined
+    return '';
 }
 
 
@@ -2069,11 +2136,15 @@ sub format_html_rowlabel {
     my ($type,$labeldata) = split(':',$rowlabel,2);
     my $result = '';
     if ($type eq 'symb') {
-        my ($symb,$mapid,$resid,$title) = split(':',$labeldata);
-        $symb = &Apache::lonnet::unescape($symb);
+        my ($symb,$mapid,$resid,$title,$ufn) = split(':',$labeldata);
+        $ufn   = 'default' if (!defined($ufn) || $ufn eq '');
+        $ufn   = &Apache::lonnet::unescape($ufn);
+        $symb  = &Apache::lonnet::unescape($symb);
+        $title = &Apache::lonnet::unescape($title);
         $result = '<a href="/adm/assesscalc?usymb='.$symb.
             '&uname='.$sheet->{'uname'}.'&udom='.$sheet->{'udom'}.
-                '&mapid='.$mapid.'&resid='.$resid.'">'.$title.'</a>';
+                '&ufn='.$ufn.
+                    '&mapid='.$mapid.'&resid='.$resid.'">'.$title.'</a>';
     } elsif ($type eq 'student') {
         my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
         if ($fullname =~ /^\s*$/) {
@@ -2097,8 +2168,10 @@ sub format_csv_rowlabel {
     my ($type,$labeldata) = split(':',$rowlabel,2);
     my $result = '';
     if ($type eq 'symb') {
-        my ($symb,$mapid,$resid,$title) = split(':',$labeldata);
-        $symb = &Apache::lonnet::unescape($symb);
+        my ($symb,$mapid,$resid,$title,$ufn) = split(':',$labeldata);
+        $ufn   = &Apache::lonnet::unescape($ufn);
+        $symb  = &Apache::lonnet::unescape($symb);
+        $title = &Apache::lonnet::unescape($title);
         $result = $title;
     } elsif ($type eq 'student') {
         my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
@@ -2119,8 +2192,10 @@ sub format_excel_rowlabel {
     my ($type,$labeldata) = split(':',$rowlabel,2);
     my $result = '';
     if ($type eq 'symb') {
-        my ($symb,$mapid,$resid,$title) = split(':',$labeldata);
-        $symb = &Apache::lonnet::unescape($symb);
+        my ($symb,$mapid,$resid,$title,$ufn) = split(':',$labeldata);
+        $ufn   = &Apache::lonnet::unescape($ufn);
+        $symb  = &Apache::lonnet::unescape($symb);
+        $title = &Apache::lonnet::unescape($title);
         $result = $title;
     } elsif ($type eq 'student') {
         my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
@@ -2228,10 +2303,11 @@ sub get_student_rowlabels {
             return 'Could not access course data';
         }
         #
-        my %assesslist;
+        my %assesslist = ();
         foreach ('Feedback','Evaluation','Tutoring','Discussion') {
             my $symb = '_'.lc($_);
-            $assesslist{$symb} = join(':',('symb',$symb,0,0,$_));
+            $assesslist{$symb} = join(':',('symb',$symb,0,0,
+                                           &Apache::lonnet::escape($_)));
         }
         #
         while (my ($key,$srcf) = each(%course_db)) {
@@ -2243,8 +2319,9 @@ sub get_student_rowlabels {
                 my $symb=
                     &Apache::lonnet::declutter($course_db{'map_id_'.$mapid}).
                         '___'.$resid.'___'.&Apache::lonnet::declutter($srcf);
-                $assesslist{$symb}='symb:'.&Apache::lonnet::escape($symb).':'
-                    .$mapid.':'.$resid.':'.$course_db{'title_'.$id};
+                $assesslist{$symb} ='symb:'.&Apache::lonnet::escape($symb).':'
+                    .$mapid.':'.$resid.':'.
+                        &Apache::lonnet::escape($course_db{'title_'.$id});
             }
         }
         untie(%course_db);
@@ -2341,12 +2418,8 @@ sub updatestudentassesssheet {
         unless ((exists($sheet->{'rowlabel'}->{$usy}) && 
                  (defined($sheet->{'rowlabel'}->{$usy})) || (!$1) ||
                  ($formula =~ /^(~~~|---)/) )) {
-            $f{$_}='!!! Obsolete';
+            $f{$cell}='!!! Obsolete';
             $changed=1;
-        } elsif ($ufn) {
-            # I do not think this works any more
-            $sheet->{'rowlabel'}->{$usy}
-                =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn&\usymb\=/;
         }
     }
     # New and unknown keys
@@ -2687,7 +2760,7 @@ sub forcedrecalc {
             &checkthis($uname.':'.$udom.':assesscalc:'.$map,$time) ||
             &checkthis($uname.':'.$udom.':assesscalc:'.$usymb,$time)) {
             return 1;
-        } 
+        }
     } else {
         if (&checkthis('::studentcalc:',$time) || 
             &checkthis($uname.':'.$udom.':studentcalc:',$time)) {
@@ -2708,6 +2781,7 @@ sub exportsheet {
     $udom  = $udom  || $sheet->{'udom'};
     $stype = $stype || $sheet->{'sheettype'};
     my @exportarr=();
+    # This handles the assessment sheets for '_feedback', etc
     if (defined($usymb) && ($usymb=~/^\_(\w+)/) && 
         (!defined($fn) || $fn eq '')) {
         $fn='default_'.$1;
@@ -2868,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/) {
@@ -2953,11 +3028,16 @@ sub handler {
         delete $ENV{'form.unewformula'} if (exists($ENV{'form.unewformula'}));
     }
     #
-    # Clean up symb and spreadsheet filename
+    # Look for special assessment spreadsheets - '_feedback', etc.
     #
-    if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) {
+    if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'} || 
+                                             $ENV{'form.ufn'} eq '' || 
+                                             $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;
+    }
     #
     # Interactive loading of specific sheet?
     #
@@ -3093,7 +3173,7 @@ ENDSCRIPT
     # If a new formula had been entered, go from work copy
     if ($ENV{'form.unewfield'}) {
         $r->print('<h2>Modified Workcopy</h2>');
-        $ENV{'form.unewformula'}=~s/\'/\"/g;
+        #$ENV{'form.unewformula'}=~s/\'/\"/g;
         $r->print('<p>Cell '.$ENV{'form.unewfield'}.' = <pre>');
         $r->print(&HTML::Entities::encode($ENV{'form.unewformula'}).
                   '</pre></p>');
@@ -3159,6 +3239,7 @@ ENDSCRIPT
         $oldsheets{'course'} ne $sheet->{'cid'}) {
         undef %oldsheets;
         undef %loadedcaches;
+        undef %Section;
     }
     $oldsheets{'course'} = $sheet->{'cid'};
     #
@@ -3225,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.'"');
@@ -3272,3 +3353,5 @@ ENDSCRIPT
 
 1;
 __END__
+
+