--- loncom/interface/spreadsheet/Spreadsheet.pm 2003/05/22 21:16:35 1.3
+++ loncom/interface/spreadsheet/Spreadsheet.pm 2003/06/18 15:32:37 1.13
@@ -1,5 +1,5 @@
#
-# $Id: Spreadsheet.pm,v 1.3 2003/05/22 21:16:35 matthew Exp $
+# $Id: Spreadsheet.pm,v 1.13 2003/06/18 15:32:37 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -98,6 +98,10 @@ sub new {
coursedesc => $ENV{'course.'.$ENV{'request.course.id'}.'.description'},
coursefilename => $ENV{'request.course.fn'},
#
+ # Flags
+ temporary => 0, # true if this sheet has been modified but not saved
+ new_rows => 0, # true if this sheet has new rows
+ #
# blackout is used to determine if any data needs to be hidden from the
# student.
blackout => 0,
@@ -141,24 +145,21 @@ sub filename {
if (@_) {
my ($newfilename) = @_;
if (! defined($newfilename) || $newfilename eq 'Default' ||
- $newfilename !~ /\w/ || $newfilename =~ /\W/) {
- my %tmphash = &Apache::lonnet::get('environment',
- ['spreadsheet_default_'.
- $self->{'type'}],
- $self->{'cdom'},
- $self->{'cnum'});
- my ($tmp) = keys(%tmphash);
- if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- $newfilename=$tmphash{'spreadsheet_default_'.$self->{'type'}};
+ $newfilename !~ /\w/ || $newfilename eq '') {
+ my $key = 'course.'.$self->{'cid'}.'.spreadsheet_default_'.
+ $self->{'type'};
+ if (exists($ENV{$key}) && $ENV{$key} ne '') {
+ $newfilename = $ENV{$key};
+ } else {
+ $newfilename = 'default_'.$self->{'type'};
}
}
- if (! defined($newfilename) ||
- $newfilename !~ /\w/ ||
- $newfilename =~ /^\W*$/) {
- $newfilename = 'default.'.$self->{'type'};
- } else {
- my $regexp = '_'.$self->{'type'}.'$';
- if ($newfilename !~ /$regexp/) {
+ if ($newfilename !~ /\w/ || $newfilename =~ /^\W*$/) {
+ $newfilename = 'default_'.$self->{'type'};
+ }
+ if ($newfilename !~ /^default\.$self->{'type'}$/ ) {
+ if ($newfilename !~ /_$self->{'type'}$/) {
+ $newfilename =~ s/[\s_]*$//;
$newfilename .= '_'.$self->{'type'};
}
}
@@ -183,7 +184,7 @@ default spreadsheets.......!
sub make_default {
my $self = shift();
my $result = &Apache::lonnet::put('environment',
- {'spreadsheet_default_'.$self->{'type'} => $self->filename()},
+ {'spreadsheet_default_'.$self->{'type'} => $self->filename()},
$self->{'cdom'},$self->{'cnum'});
return $result if ($result ne 'ok');
my $symb = $self->{'symb'};
@@ -216,10 +217,18 @@ sub is_default {
if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
$default_filename = $tmphash{'spreadsheet_default_'.$self->{'type'}};
}
+ if ($default_filename =~ /^\s*$/) {
+ $default_filename = 'default_'.$self->{'type'};
+ }
return 1 if ($self->filename() eq $default_filename);
return 0;
}
+sub initialize {
+ # This method is here to remind you that it will be overridden by
+ # the descendents of the spreadsheet class.
+}
+
sub initialize_spreadsheet_package {
&load_spreadsheet_expirationdates();
&clear_spreadsheet_definition_cache();
@@ -814,7 +823,7 @@ sub expandnamed {
push @matches,$parameter if ($parameter =~ /$expression/);
}
if (scalar(@matches) == 0) {
- $returnvalue = 'unmatched parameter: '.$parameter;
+ $returnvalue = '""';#'"unmatched parameter: '.$parameter.'"';
} elsif (scalar(@matches) == 1) {
# why do we not do this lookup here, instead of delaying it?
$returnvalue = '$c{\''.$matches[0].'\'}';
@@ -830,7 +839,7 @@ sub expandnamed {
} else {
# There was a negative number of matches, which indicates
# something is wrong with reality. Better warn the user.
- $returnvalue = 'bizzare parameter: '.$parameter;
+ $returnvalue = '"bizzare parameter: '.$parameter.'"';
}
return $returnvalue;
}
@@ -1109,6 +1118,24 @@ sub calcsheet {
## Output Helpers
##
###########################################################
+sub display {
+ my $self = shift;
+ my ($r) = @_;
+ $self->compute($r);
+ my $outputmode = 'html';
+ if ($ENV{'form.output_format'} =~ /^(html|excel|csv)$/) {
+ $outputmode = $ENV{'form.output_format'};
+ }
+ if ($outputmode eq 'html') {
+ $self->outsheet_html($r);
+ } elsif ($outputmode eq 'excel') {
+ $self->outsheet_excel($r);
+ } elsif ($outputmode eq 'csv') {
+ $self->outsheet_csv($r);
+ }
+ return;
+}
+
############################################
## HTML output routines ##
############################################
@@ -1139,8 +1166,8 @@ sub html_template_row {
for (my $i = 0; $i<=$#rowdata; $i++) {
my $cell = $rowdata[$i];
if ($i < $num_uneditable) {
- $row_html .= '
'.
- &html_editable_cell($cell,'#DDCCFF',$allowed).' | ';
+ $row_html .= ''.
+ &html_uneditable_cell($cell,'#FFDDDD',$allowed).' | ';
} else {
$row_html .= ''.
&html_editable_cell($cell,'#EOFFDD',$allowed).' | ';
@@ -1211,6 +1238,55 @@ sub html_row {
return $row_html;
}
+sub html_header {
+ my $self = shift;
+ return '' if (! $ENV{'request.role.adv'});
+ return "\n".
+ 'Output Format |
---|
'."\n".
+ '
'.&output_selector()." |
\n".
+ "
\n";
+}
+
+sub output_selector {
+ my $output_selector = '