--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/07/17 15:22:14	1.17
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2003/09/04 15:17:41	1.22
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.17 2003/07/17 15:22:14 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.22 2003/09/04 15:17:41 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,7 +165,7 @@ 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;
 <!-- load / save dialogs -->
@@ -226,7 +226,7 @@ sub handler {
     # 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 
     #
@@ -318,7 +318,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"';
@@ -339,7 +339,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>
@@ -363,6 +363,30 @@ ENDSCRIPT
         }
     }
     ##
+    ## Take care of "backdoor" spreadsheet expiration / recalc stuff
+    if ($allowed_to_edit && exists($ENV{'form.recalc'})) {
+        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;
@@ -422,9 +446,24 @@ 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="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));
