--- loncom/interface/spreadsheet/lonspreadsheet.pm	2003/05/19 15:53:07	1.3
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2003/05/29 13:39:38	1.8
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.3 2003/05/19 15:53:07 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.8 2003/05/29 13:39:38 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,6 +88,101 @@ sub selectbox {
     return $selout.'</select>';
 }
 
+sub file_dialogs {
+    my ($spreadsheet) = @_;
+    my $bgcolor = "#FFFFFF";
+    my $sheettype = $spreadsheet->{'type'};
+    my $result = '';
+    ##
+    ## Deal with saving the spreadsheet
+    if (exists($ENV{'form.save'}) && 
+        exists($ENV{'form.savefilename'})) {
+        $spreadsheet->filename($ENV{'form.savefilename'});
+        my $save_status = $spreadsheet->save();
+        if ($save_status ne 'ok') {
+            $result .= "An error occurred while saving the spreadsheet".
+                "There error is:".$save_status;
+            return $result;
+        } else {
+            $result .= "Spreadsheet saved as ".$ENV{'form.savefilename'};
+        }
+    } elsif (exists($ENV{'form.newformula'}) && 
+             exists($ENV{'form.cell'})       && 
+             $ENV{'form.cell'} ne '' ) {
+        ##
+        ## Make any requested modifications to the spreadsheet
+        $spreadsheet->modify_cell($ENV{'form.cell'},
+                                  $ENV{'form.newformula'});
+        $spreadsheet->save_tmp();
+        # output that we are dealing with a temporary file
+        $result .=&hiddenfield('workcopy',$sheettype);
+        $result .='<pre>'.$ENV{'form.cell'}.' = '.
+                  $ENV{'form.newformula'}."</pre>\n";
+    }
+    ##
+    ## Editing code
+    $result .=&hiddenfield('cell','').
+              &hiddenfield('newformula','');
+    ##
+    ## Create the save and load dialogs
+    my $filename = $spreadsheet->filename();
+    $filename = 'Default' if ($filename =~ /^default\.$sheettype/i);
+    $filename =~ s/_$sheettype$//;
+    my $save_dialog = '<nobr>'.
+        '<input type="submit" name="save" value="Save as" /> '.
+        '<input type="text" name="savefilename" size="30" value="'.
+        $filename.'" />'.
+        '</nobr>';
+    my $makedefault_dialog = '<input type="submit" name="makedefault" '.
+        'value="Make This Sheet the Default"/>';
+    #
+    my $link = '<a href="javascript:openbrowser'.
+        "('sheet','loadfilename','spreadsheet')\">Browse</a>";
+    my $load_dialog = <<END;
+<table bgcolor="$bgcolor">
+<tr><td><input type="submit" name="load" value="Load" /></td>
+    <td><nobr>
+        <input type="text" name="loadfilename" size="25" value="$filename" />
+        $link</nobr>
+    </td></tr>
+<tr><td>&nbsp;</td><td>
+    <select name="fileselect" onchange="document.sheet.loadfilename.value=document.sheet.fileselect.value" >
+END
+    my $default_filename_set = 0;
+    foreach my $sheetfilename ($spreadsheet->othersheets()) {
+        $sheetfilename =~ s/_$sheettype$//;
+        $load_dialog .= '    <option name="'.$sheetfilename.'"';
+        if ($filename eq $sheetfilename) {
+            $load_dialog .= ' selected';
+            $default_filename_set = 1;
+        }
+        $load_dialog .= '>'.$sheetfilename."</option>\n";
+    }
+    if ($default_filename_set) {
+        $load_dialog .= '<option name="Default">Default</option>'."\n";
+    } else {
+        $load_dialog .= '<option name="Default" selected >Default</option>'.
+            "\n";
+    }
+    $load_dialog .= "</td><td>&nbsp;</td></tr>\n</table>\n";
+        #
+    $result .=<<END;
+<!-- load / save dialogs -->
+<table cellspacing="2">
+<tr>
+    <td>$load_dialog</td>
+    <td>
+        <table bgcolor="$bgcolor">
+        <tr><td>$save_dialog</td></tr>
+        <tr><td align="center">$makedefault_dialog</td></tr>
+        </table>
+    </td>
+</tr>
+</table>
+END
+    return $result;
+}
+
 sub handler {
     my $r=shift;
     #
@@ -99,7 +194,7 @@ sub handler {
     # Check the course homeserver
     $loaderror= &Apache::lonnet::overloaderror($r,
                       $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
-    if ($loaderror) { return $loaderror; } 
+#    if ($loaderror) { return $loaderror; } 
     #
     # HTML Header
     #
@@ -155,6 +250,7 @@ sub handler {
                                                 $ENV{'request.course.id'});
     my $allowed_to_view =  &Apache::lonnet::allowed('vgr',
                                                 $ENV{'request.course.id'});
+
     #
     # Only those able to view others grades will be allowed to continue 
     # if they are not requesting their own.
@@ -175,10 +271,14 @@ sub handler {
     ##
     ## Spit out the javascript required for editing
     ##
-    if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
+    if ($allowed_to_edit) {
+        my $extra_javascript = 
+            &Apache::loncommon::browser_and_searcher_javascript();
         $r->print(<<ENDSCRIPT);
 <script language="JavaScript">
 
+    $extra_javascript
+
     var editwin;
 
     function celledit(cellname,cellformula) {
@@ -229,6 +329,7 @@ ENDSCRIPT
         #
         if (exists($ENV{'form.load'}) && exists($ENV{'form.loadfilename'})) {
             $filename = $ENV{'form.loadfilename'};
+            $ENV{'form.workcopy'} = 'no';
         }
     }
     ##
@@ -250,84 +351,37 @@ ENDSCRIPT
         # error error - run in circles, scream and shout
         return;
     }
+    $spreadsheet->initialize();
+    #
+    # Output selector
+    $r->print('<input type="submit" value="Update Display" /><br />');
     ##
     ## Editing/loading/saving
     if ($allowed_to_edit) {
-        ##
-        ## Deal with saving the spreadsheet
-        if (exists($ENV{'form.save'}) && 
-            exists($ENV{'form.savefilename'})) {
-            $spreadsheet->filename($ENV{'form.savefilename'});
-            my $save_status = $spreadsheet->save();
-            if ($save_status ne 'ok') {
-                $r->print("An error occurred while saving the spreadsheet".
-                          "There error is:".$save_status);
-            } else {
-                $r->print("Spreadsheet saved as ".$ENV{'form.savefilename'});
-            }
-        } elsif (exists($ENV{'form.newformula'}) && 
-                 exists($ENV{'form.cell'})       && 
-                 $ENV{'form.cell'} ne '' ) {
-            ##
-            ## Make any requested modifications to the spreadsheet
-            $spreadsheet->modify_cell($ENV{'form.cell'},
-                                      $ENV{'form.newformula'});
-            $spreadsheet->save_tmp();
-            # output that we are dealing with a temporary file
-            $r->print(&hiddenfield('workcopy',$sheettype));
-            $r->print('<pre>'.$ENV{'form.cell'}.' = '.
-                      $ENV{'form.newformula'}.'</pre>'."\n");
-        }
-        ##
-        ## Editing code
-        $r->print(&hiddenfield('cell','').
-                  &hiddenfield('newformula',''));
-        ##
-        ## Create the save and load dialogs
-        $filename = $spreadsheet->filename();
-        $filename = '' if ($filename =~ /^default\.$sheettype/i);
-        $filename =~ s/_$sheettype$//;
-        my $save_dialog = 
-            '<input type="submit" name="save" value="Save as ..." /> '.
-                '<input type="text" name="savefilename" size="30" value="'.
-                    $filename.'" />';
-        my $makedefault_dialog = 
-            '<input type="submit" name="makedefault" value="Make Default"/>';
-        #
-        my $load_dialog = 
-            '<input type="submit" name="load" value="Load ..." />'.
-                '<select name="loadfilename">'.
-                    '<option name="Default">Default</option>'."\n";
-        foreach my $sheetfilename ($spreadsheet->othersheets()) {
-            $sheetfilename =~ s/_$sheettype$//;
-            $load_dialog .= '<option name="'.$sheetfilename.'"';
-            if ($filename eq $sheetfilename) {
-                $load_dialog .= ' selected';
-            }
-            $load_dialog .= '>'.$sheetfilename."</option>\n";
-        }
-        #
-        $r->print(<<END);
-<!-- load / save dialogs -->
-<table cellspacing="3">
-<tr>
-<td>$load_dialog</td>
-<td>$save_dialog</td>
-<td>$makedefault_dialog</td>
-</tr>
-</table>
-END
+        $r->print('<table><tr><td>'.$spreadsheet->html_header().'</td>'.
+                  '<td valign="bottom">'.
+                  &file_dialogs($spreadsheet)."</td></tr></table>\n");
         $r->rflush();
+    } else {
+        $r->print('<table><tr><td>'.$spreadsheet->html_header().
+                  "</td></tr></table>\n");
     }
     #
     # Keep track of the filename
     $r->print(&hiddenfield('filename',$filename));
     #
-    $r->print($spreadsheet->get_title());
-    if ($allowed_to_view || $allowed_to_edit) {
-        $r->print($spreadsheet->parent_link());
+    # Keep track of the number of times we have been called, sort of.
+    $r->print(&hiddenfield('not_first_run','whatever'));
+    #
+    if (exists($ENV{'form.not_first_run'}) || $sheettype ne 'classcalc') {
+        $r->print($spreadsheet->get_html_title());
+        if ($allowed_to_view || $allowed_to_edit) {
+            $r->print($spreadsheet->parent_link());
+        }
+        $spreadsheet->display($r);
+    } else {
+        $r->print("<h2>Make your selections and bonk the 'update display' button</h2>");
     }
-    $spreadsheet->display($r);
     $r->print('</form></body></html>');
     return OK;
 }