--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/06/19 16:04:06	1.13
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2003/09/30 15:40:09	1.26
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.13 2003/06/19 16:04:06 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.26 2003/09/30 15:40:09 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,12 +54,16 @@ built-in functions.
 package Apache::lonspreadsheet;
             
 use strict;
+use warnings FATAL=>'all';
+no warnings 'uninitialized';
 use Apache::classcalc();
 use Apache::studentcalc();
 use Apache::assesscalc();
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::lonhtmlcommon;
+use Apache::lonlocal;
+use Apache::loncoursedata();
 use HTML::Entities();
 
 ##
@@ -103,9 +107,8 @@ sub file_dialogs {
         if ($save_status ne 'ok') {
             $message .= "An error occurred while saving the spreadsheet".
                 "There error is:".$save_status;
-            return $result;
         } else {
-            $message .= "Spreadsheet saved as ".$ENV{'form.savefilename'};
+            $message .= "Spreadsheet saved as ".$spreadsheet->filename();
         }
     } elsif (exists($ENV{'form.newformula'}) && 
              exists($ENV{'form.cell'})       && 
@@ -165,9 +168,13 @@ END
         }
         $load_dialog .= '>'.$sheetfilename."</option>\n";
     }
-    $load_dialog .= "</td><td>&nbsp;</td></tr>\n</table>\n";
+    $load_dialog .= "</select>\n</td><td>&nbsp;</td></tr>\n</table>\n";
         #
     $result .=<<END;
+<!-- 
+    <fieldset title="File Dialogs" >
+    <legend>File Dialogs</legend>
+  -->
 <!-- load / save dialogs -->
 <table cellspacing="2">
 <tr>
@@ -180,6 +187,9 @@ END
     </td>
 </tr>
 </table>
+<!--
+    </fieldset>
+  -->
 END
     return ($result,$message);
 }
@@ -200,7 +210,7 @@ sub handler {
     # HTML Header
     #
     if ($r->header_only) {
-        $r->content_type('text/html');
+        &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
         return OK;
     }
@@ -214,11 +224,19 @@ sub handler {
             $r->uri.":opa:0:0:Cannot modify spreadsheet";
         return HTTP_NOT_ACCEPTABLE; 
     }
+    my $courseid = $ENV{'request.course.id'};
+    #
+    # Do not allow students to continue if standard grading is in effect.
+    if ($ENV{'request.role'} =~ /^st\./) {
+        if ($ENV{'course.'.$courseid.'.grading'} eq 'standard') {
+            return HTTP_NOT_ACCEPTABLE;
+        }
+    }
     #
     # Get query string for limited number of parameters
     #
     &Apache::loncommon::get_unprocessed_cgi
-        ($ENV{'QUERY_STRING'},['sname','sdomain','usymb','filename']);
+        ($ENV{'QUERY_STRING'},['sname','sdomain','usymb','filename','recalc']);
     #
     # Deal with restricted student permissions 
     #
@@ -238,13 +256,6 @@ sub handler {
         $name   = $ENV{'form.sname'};
         $domain = $ENV{'form.sdomain'};
     }
-    #
-    # Open page, try to prevent browser cache.
-    #
-    $r->content_type('text/html');
-    $r->header_out('Cache-control','no-cache');
-    $r->header_out('Pragma','no-cache');
-    $r->send_http_header;
     ##
     ## Check permissions
     my $allowed_to_edit = &Apache::lonnet::allowed('mgr',
@@ -265,10 +276,10 @@ sub handler {
     # if they are not requesting their own.
     if ($sheettype eq 'classcalc') {
         if (! $allowed_to_view) {
-            $r->print('<h1>Access Permission Denied</h1>'.
-                      '</form></body></html>');
-            return OK;
-        }
+	    $ENV{'user.error.msg'}=
+		$r->uri.":vgr:0:0:Access Permission Denied";
+	    return HTTP_NOT_ACCEPTABLE; 
+	}
     }
     if ((($name   ne $ENV{'user.name'} ) ||
          ($domain ne $ENV{'user.domain'})) && $sheettype ne 'classcalc') {
@@ -278,15 +289,21 @@ sub handler {
             my $stu_sec = &Apache::lonnet::usection($domain,$name,
                                                     $ENV{'request.course.id'});
             if ($stu_sec ne $ENV{'request.course.sec'}) {
-                $r->print
-                    ('<h1>The student requested is not in your section.</h1>'.
-                     '</form></body></html>');
-                return OK;
+		$ENV{'user.error.msg'}=
+		    $r->uri.":vgr:0:0:Requested student not in your section.";
+		return HTTP_NOT_ACCEPTABLE; 
             }
         }
     }
 
     #
+    # Open page, try to prevent browser cache.
+    #
+    &Apache::loncommon::content_type($r,'text/html');
+    &Apache::loncommon::no_cache($r);
+    $r->send_http_header;
+
+    #
     # Header....
     #
     $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
@@ -311,7 +328,7 @@ sub handler {
         edit_text +='<html><head><title>Cell Edit Window</title></head><body>';
         edit_text += '<form name="editwinform">';
         edit_text += '<center><h3>Cell '+cellname+'</h3>';
-        edit_text += '<textarea name="newformula" cols="40" rows="6"';
+        edit_text += '<textarea name="newformula" cols="60" rows="12"';
         edit_text += ' wrap="off" >'+cellformula+'</textarea>';
         edit_text += '</br>';
         edit_text += '<input type="button" name="accept" value="Accept"';
@@ -332,7 +349,7 @@ sub handler {
             editwin.close();
         }
 
-        editwin = window.open($nothing,'CellEditWin','height=200,width=350,scrollbars=no,resizeable=yes,alwaysRaised=yes,dependent=yes',true);
+        editwin = window.open($nothing,'CellEditWin','height=280,width=480,scrollbars=no,resizeable=yes,alwaysRaised=yes,dependent=yes',true);
         editwin.document.write(edit_text);
     }
 </script>
@@ -356,6 +373,33 @@ ENDSCRIPT
         }
     }
     ##
+    ## Take care of "backdoor" spreadsheet expiration / recalc stuff
+    if ($allowed_to_edit && exists($ENV{'form.recalc'})) {
+        if (exists($ENV{'form.recalc'})) {
+            &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'});
+        }
+        if ($ENV{'form.recalc'} eq 'ilovewastingtime') {
+            &Apache::lonnet::logthis('ilovewastingtime');
+            # expire ALL spreadsheets
+            &Apache::lonnet::expirespread('','','studentcalc');
+            &Apache::lonnet::expirespread('','','assesscalc');
+        } elsif ($ENV{'form.recalc'} =~ /^symb:/) {
+            # expire for all students on this symb
+            my ($symb) = ($ENV{'form.recalc'} =~ /^symb:(.*)$/);
+            &Apache::lonnet::logthis('symb = '.$symb);
+            &Apache::lonnet::expirespread('','','assesscalc',$symb);
+            &Apache::lonnet::expirespread('','','studentcalc');
+        } elsif ($ENV{'form.recalc'} =~ /^student:/) {
+            # expire all assessment spreadsheets for this user
+            my ($sname,$sdom) = ($ENV{'form.recalc'}=~/^student:(.*):(.*)$/);
+            &Apache::lonnet::logthis('student = '.$sname.':'.$sdom);
+            if (defined($sname) && defined($sdom)) {
+                &Apache::lonnet::expirespread($sname,$sdom,'assesscalc');
+                &Apache::lonnet::expirespread($sname,$sdom,'studentcalc');
+            }
+        }
+    }
+    ##
     ## Make the spreadsheet
     &Apache::Spreadsheet::initialize_spreadsheet_package();
     my $spreadsheet = undef;
@@ -415,9 +459,25 @@ END
     }
     $r->rflush();
     #
+    $r->print("<table><tr>");
     if ($sheettype eq 'classcalc') {
-        $r->print('<input type="submit" value="Generate Spreadsheet" /><br />');
+        $r->print('<td><input type="submit" value="'.
+		  &mt('Generate Spreadsheet').'" />'.
+                  '</td>');
+    }
+    if ($allowed_to_view) {
+        $r->print('<td>'.
+                  &Apache::loncommon::help_open_topic("Spreadsheet_About",
+                                                      'Spreadsheet Help').
+                  '</td>');
     }
+    if ($allowed_to_edit) {
+        $r->print('<td>'.
+                  &Apache::loncommon::help_open_topic("Spreadsheet_Editing",
+                                                      'Editing Help').
+                  '</td>');
+    }
+    $r->print('</tr></table>');
     #
     # Keep track of the filename
     $r->print(&hiddenfield('filename',$filename));
@@ -430,6 +490,7 @@ END
         if ($allowed_to_view || $allowed_to_edit) {
             $r->print($spreadsheet->parent_link());
         }
+        $r->rflush();
         $spreadsheet->display($r);
     }
     $r->print('</form></body></html>');