[BACK]Return to lonspreadsheet.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface / spreadsheet

Diff for /loncom/interface/spreadsheet/lonspreadsheet.pm between versions 1.10 and 1.11

version 1.10, 2003/06/18 15:32:37 version 1.11, 2003/06/18 19:44:22
Line 93  sub file_dialogs { Line 93  sub file_dialogs {
     my $bgcolor = "#FFFFFF";      my $bgcolor = "#FFFFFF";
     my $sheettype = $spreadsheet->{'type'};      my $sheettype = $spreadsheet->{'type'};
     my $result = '';      my $result = '';
       my $message = '';
     ##      ##
     ## Deal with saving the spreadsheet      ## Deal with saving the spreadsheet
     if (exists($ENV{'form.save'}) &&       if ((exists($ENV{'form.save'}) || exists($ENV{'form.makedefault'})) && 
         exists($ENV{'form.savefilename'})) {          exists($ENV{'form.savefilename'})) {
         $spreadsheet->filename($ENV{'form.savefilename'});          $spreadsheet->filename($ENV{'form.savefilename'});
         my $save_status = $spreadsheet->save();          my $save_status = $spreadsheet->save();
         if ($save_status ne 'ok') {          if ($save_status ne 'ok') {
             $result .= "An error occurred while saving the spreadsheet".              $message .= "An error occurred while saving the spreadsheet".
                 "There error is:".$save_status;                  "There error is:".$save_status;
             return $result;              return $result;
         } else {          } else {
             $result .= "Spreadsheet saved as ".$ENV{'form.savefilename'};              $message .= "Spreadsheet saved as ".$ENV{'form.savefilename'};
         }          }
     } elsif (exists($ENV{'form.newformula'}) &&       } elsif (exists($ENV{'form.newformula'}) && 
              exists($ENV{'form.cell'})       &&                exists($ENV{'form.cell'})       && 
Line 116  sub file_dialogs { Line 117  sub file_dialogs {
         $spreadsheet->save_tmp();          $spreadsheet->save_tmp();
         # output that we are dealing with a temporary file          # output that we are dealing with a temporary file
         $result .=&hiddenfield('workcopy',$sheettype);          $result .=&hiddenfield('workcopy',$sheettype);
         $result .='<pre>'.$ENV{'form.cell'}.' = '.          if ($ENV{'form.newformula'} !~ /^\s*$/) {
                   $ENV{'form.newformula'}."</pre>\n";              $message .='<table><tr>'.
                 '<td valign="top"><pre>Cell '.$ENV{'form.cell'}.' = </pre></td>'.
                 '<td><pre>'.$ENV{'form.newformula'}."</pre></td></tr></table>\n";
           } else {
               $message .= 'Deleted contents of cell '.$ENV{'form.cell'}.'.';
           }
     }      }
     ##      ##
     ## Editing code      ## Editing code
Line 136  sub file_dialogs { Line 142  sub file_dialogs {
         $truefilename.'" />'.          $truefilename.'" />'.
         '</nobr>';          '</nobr>';
     my $makedefault_dialog = '<input type="submit" name="makedefault" '.      my $makedefault_dialog = '<input type="submit" name="makedefault" '.
         'value="Make This Sheet the Default"/>';          'value="Save as & Make This Sheet the Default"/>';
     #      #
     my $link = '<a href="javascript:openbrowser'.      my $link = '<a href="javascript:openbrowser'.
         "('sheet','loadfilename','spreadsheet')\">Select Spreadsheet File</a>";          "('sheet','loadfilename','spreadsheet')\">Select Spreadsheet File</a>";
Line 175  END Line 181  END
 </tr>  </tr>
 </table>  </table>
 END  END
     return $result;      return ($result,$message);
 }  }
   
 sub handler {  sub handler {
Line 352  ENDSCRIPT Line 358  ENDSCRIPT
     ##      ##
     ## Editing/loading/saving      ## Editing/loading/saving
     if ($allowed_to_edit) {      if ($allowed_to_edit) {
           my ($html,$action_message) = &file_dialogs($spreadsheet);
         if ($ENV{'form.makedefault'}) {          if ($ENV{'form.makedefault'}) {
             $spreadsheet->make_default();              $spreadsheet->make_default();
               if ($action_message) {
                   $action_message .= '<br />';
               }
               $action_message .= 'Made this spreadsheet the default';
               if ($sheettype eq 'classcalc') {
                   $action_message .= ' for the course';
               } elsif ($sheettype eq 'studentcalc') {
                   $action_message .= ' for all students';
               } elsif ($sheettype eq 'assesscalc') {
                   $action_message .= ' for all assessments';
               }
               $action_message .= '.';
         }          }
         $r->print('<table><tr><td>'.$spreadsheet->html_header().'</td>'.          $r->print('<table><tr><td>'.$spreadsheet->html_header().'</td>'.
                   '<td valign="bottom">'.                    '<td valign="bottom">'.$html."</td></tr></table>\n");
                   &file_dialogs($spreadsheet)."</td></tr></table>\n");          $r->print(<<END);
   <table>
   <tr><td valign="top"><b>Last Action:</b></td>
       <td>&nbsp;</td>
       <td>$action_message</td>
   </tr>
   </table>
   END
         $r->rflush();          $r->rflush();
     } else {      } else {
         $r->print('<table><tr><td>'.$spreadsheet->html_header().          $r->print('<table><tr><td>'.$spreadsheet->html_header().
                   "</td></tr></table>\n");                    "</td></tr></table>\n");
     }      }
       $r->rflush();
     #      #
     if (! exists($ENV{'form.not_first_run'}) && $sheettype eq 'classcalc') {      if (! exists($ENV{'form.not_first_run'}) && $sheettype eq 'classcalc') {
         $r->print('<input type="submit" value="Generate Spreadsheet" /><br />');          $r->print('<input type="submit" value="Generate Spreadsheet" /><br />');
Removed from v.1.10  
changed lines
  Added in v.1.11

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>