--- loncom/interface/spreadsheet/lonspreadsheet.pm 2003/06/18 15:32:37 1.10 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2003/12/08 19:59:09 1.31 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.10 2003/06/18 15:32:37 matthew Exp $ +# $Id: lonspreadsheet.pm,v 1.31 2003/12/08 19:59: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(); ## @@ -68,8 +72,8 @@ use HTML::Entities(); sub textfield { my ($title,$name,$value)=@_; - return "\n

$title:
". - ''; + return "\n

$title:
". + ''; } sub hiddenfield { @@ -79,11 +83,11 @@ sub hiddenfield { sub selectbox { my ($title,$name,$value,%options)=@_; - my $selout="\n

$title:
".''; foreach (sort keys(%options)) { $selout.=''; } return $selout.''; } @@ -93,18 +97,18 @@ sub file_dialogs { my $bgcolor = "#FFFFFF"; my $sheettype = $spreadsheet->{'type'}; my $result = ''; + my $message = ''; ## ## Deal with saving the spreadsheet - if (exists($ENV{'form.save'}) && + if ((exists($ENV{'form.save'}) || exists($ENV{'form.makedefault'})) && 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". + $message .= "An error occurred while saving the spreadsheet". "There error is:".$save_status; - return $result; } else { - $result .= "Spreadsheet saved as ".$ENV{'form.savefilename'}; + $message .= "Spreadsheet saved as ".$spreadsheet->filename(); } } elsif (exists($ENV{'form.newformula'}) && exists($ENV{'form.cell'}) && @@ -116,8 +120,13 @@ sub file_dialogs { $spreadsheet->save_tmp(); # output that we are dealing with a temporary file $result .=&hiddenfield('workcopy',$sheettype); - $result .='

'.$ENV{'form.cell'}.' = '.
-                  $ENV{'form.newformula'}."
\n"; + if ($ENV{'form.newformula'} !~ /^\s*$/) { + $message .=''. + ''. + '
'.&mt('Cell').' '.$ENV{'form.cell'}.' = 
'.$ENV{'form.newformula'}."
\n"; + } else { + $message .= &mt('Deleted contents of cell').' '.$ENV{'form.cell'}.'.'; + } } ## ## Editing code @@ -131,18 +140,19 @@ sub file_dialogs { $filename = 'Default'; } my $save_dialog = ''. - ' '. + ' '. ''. ''; my $makedefault_dialog = ''; + 'value="'.&mt('Save as & Make This Sheet the Default').'"/>'; # my $link = 'Select Spreadsheet File"; + "('sheet','loadfilename','spreadsheet')\">".&mt('Select Spreadsheet File').""; + my $load=&mt('Load:'); my $load_dialog = < - + $link @@ -152,16 +162,20 @@ sub file_dialogs { END my $default_filename_set = 0; foreach my $sheetfilename ($spreadsheet->othersheets()) { - $load_dialog .= '