--- loncom/interface/spreadsheet/Spreadsheet.pm 2003/06/18 15:32:37 1.13
+++ loncom/interface/spreadsheet/Spreadsheet.pm 2003/08/01 13:47:26 1.20
@@ -1,5 +1,5 @@
#
-# $Id: Spreadsheet.pm,v 1.13 2003/06/18 15:32:37 matthew Exp $
+# $Id: Spreadsheet.pm,v 1.20 2003/08/01 13:47:26 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -248,18 +248,27 @@ sub load_spreadsheet_expirationdates {
sub check_expiration_time {
my $self = shift;
my ($time)=@_;
- my ($key1,$key2,$key3,$key4);
+ my ($key1,$key2,$key3,$key4,$key5);
+ # Description of keys
+ #
+ # key1: all sheets of this type have expired
+ # key2: all sheets of this type for this student
+ # key3: all sheets of this type in this map for this student
+ # key4: this assessment sheet for this student
+ # key5: this assessment sheet for all students
$key1 = '::'.$self->{'type'}.':';
$key2 = $self->{'name'}.':'.$self->{'domain'}.':'.$self->{'type'}.':';
$key3 = $key2.$self->{'container'} if (defined($self->{'container'}));
- $key4 = $key2.$self->{'usymb'} if (defined($self->{'usymb'}));
- foreach my $key ($key1,$key2,$key3,$key4) {
+ $key4 = $key2.$self->{'symb'} if (defined($self->{'symb'}));
+ $key5 = $key1.$self->{'symb'} if (defined($self->{'symb'}));
+ my $returnvalue = 1; # default to okay
+ foreach my $key ($key1,$key2,$key3,$key4,$key5) {
next if (! defined($key));
- if (exists($expiredates{$key}) &&$expiredates{$key} > $time) {
- return 0;
+ if (exists($expiredates{$key}) && $expiredates{$key} > $time) {
+ $returnvalue = 0; # need to recompute
}
}
- return 1;
+ return $returnvalue;
}
######################################################
@@ -785,8 +794,8 @@ sub expandnamed {
my @vars=split(/\W+/,$formula);
my %values=();
foreach my $varname ( @vars ) {
- if ($varname=~/\D/) {
- $formula=~s/$varname/'$c{\''.$varname.'\'}'/ge;
+ if ($varname=~/^(parameter|stores|timestamp)/) {
+ $formula=~s/$varname/'$c{\''.$varname.'\'}'/ge;
$varname=~s/$var/\([\\w:\\- ]\+\)/g;
foreach (keys(%{$self->{'constants'}})) {
if ($_=~/$varname/) {
@@ -816,30 +825,32 @@ sub expandnamed {
# 4. If there is a collision, return 'bad parameter name error'
my $returnvalue = '';
my @matches = ();
+ my @values = ();
$#matches = -1;
study $expression;
- my $parameter;
- foreach $parameter (keys(%{$self->{'constants'}})) {
- push @matches,$parameter if ($parameter =~ /$expression/);
+ while (my($parameter,$value) = each(%{$self->{'constants'}})) {
+ next if ($parameter !~ /$expression/);
+ push(@matches,$parameter);
+ push(@values,$value);
}
if (scalar(@matches) == 0) {
$returnvalue = '""';#'"unmatched parameter: '.$parameter.'"';
} elsif (scalar(@matches) == 1) {
# why do we not do this lookup here, instead of delaying it?
- $returnvalue = '$c{\''.$matches[0].'\'}';
+ $returnvalue = $values[0];
} elsif (scalar(@matches) > 0) {
# more than one match. Look for a concise one
$returnvalue = "'non-unique parameter name : $expression'";
- foreach (@matches) {
- if (/^$expression$/) {
+ for (my $i=0; $i<=$#matches;$i++) {
+ if ($matches[$i] =~ /^$expression$/) {
# why do we not do this lookup here?
- $returnvalue = '$c{\''.$_.'\'}';
+ $returnvalue = $values[$i];
}
}
} 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: '.$expression.'"';
}
return $returnvalue;
}
@@ -1141,13 +1152,15 @@ sub display {
############################################
sub html_export_row {
my $self = shift();
+ my ($color) = @_;
+ $color = '#CCCCFF' if (! defined($color));
my $allowed = &Apache::lonnet::allowed('mgr',$ENV{'request.course.id'});
my $row_html;
my @rowdata = $self->get_row(0);
foreach my $cell (@rowdata) {
if ($cell->{'name'} =~ /^[A-Z]/) {
- $row_html .= '| '.
- &html_editable_cell($cell,'#CCCCFF',$allowed).' | ';
+ $row_html .= ''.
+ &html_editable_cell($cell,$color,$allowed).' | ';
} else {
$row_html .= ''.
&html_editable_cell($cell,'#DDCCFF',$allowed).' | ';
@@ -1159,14 +1172,14 @@ sub html_export_row {
sub html_template_row {
my $self = shift();
my $allowed = &Apache::lonnet::allowed('mgr',$ENV{'request.course.id'});
- my ($num_uneditable) = @_;
+ my ($num_uneditable,$importcolor) = @_;
my $row_html;
my @rowdata = $self->get_template_row();
my $count = 0;
for (my $i = 0; $i<=$#rowdata; $i++) {
my $cell = $rowdata[$i];
if ($i < $num_uneditable) {
- $row_html .= ''.
+ $row_html .= ' | '.
&html_uneditable_cell($cell,'#FFDDDD',$allowed).' | ';
} else {
$row_html .= ''.
@@ -1198,13 +1211,15 @@ sub html_editable_cell {
$value = &HTML::Entities::encode($value) if ($value !~/ /);
}
return $value if (! $allowed);
- # Make the formula safe for outputting
- $formula =~ s/\'/\"/g;
+ #
# The formula will be parsed by the browser twice before being
- # displayed to the user for editing.
- $formula = &HTML::Entities::encode(&HTML::Entities::encode($formula));
- # Escape newlines so they make it into the edit window
- $formula =~ s/\n/\\n/gs;
+ # displayed to the user for editing.
+ #
+ # The encoding string "^A-blah" is placed in []'s inside a regexp, so
+ # we specify the characters we want left alone by putting a '^' in front.
+ $formula = &HTML::Entities::encode($formula,"^A-z0-9 !#\$%-;=?~");
+ # Escape it again - this time the only encodable character is '&'
+ $formula =~ s/\&/\&/g;
# Glue everything together
$result .= "".$value."";
@@ -1220,14 +1235,19 @@ sub html_uneditable_cell {
sub html_row {
my $self = shift();
- my ($num_uneditable,$row) = @_;
+ my ($num_uneditable,$row,$exportcolor,$importcolor) = @_;
my $allowed = &Apache::lonnet::allowed('mgr',$ENV{'request.course.id'});
my @rowdata = $self->get_row($row);
my $num_cols_output = 0;
my $row_html;
+ my $color = $importcolor;
+ if ($row == 0) {
+ $color = $exportcolor;
+ }
+ $color = '#FFDDDD' if (! defined($color));
foreach my $cell (@rowdata) {
if ($num_cols_output++ < $num_uneditable) {
- $row_html .= ' | ';
+ $row_html .= ' | ';
$row_html .= &html_uneditable_cell($cell,'#FFDDDD');
} else {
$row_html .= ' | ';
@@ -1529,9 +1549,6 @@ sub load {
} else {
$self->filename($newfilename);
}
- } elsif ($filename =~ /^default\.$self->{'type'}/) {
- # if there is an Original_$stype, load it instead
- $formulas = $self->load_system_default_sheet();
} else {
# Load the spreadsheet definition file from the save file
my %tmphash = &Apache::lonnet::dump($filename,$cdom,$cnum);
@@ -1619,6 +1636,9 @@ sub save {
}
if ($self->is_default()) {
&Apache::lonnet::expirespread('','',$self->{'type'},'');
+ if ($self->{'type'} eq 'assesscalc') {
+ &Apache::lonnet::expirespread('','','studentcalc','');
+ }
}
return $reply;
}
@@ -1630,7 +1650,7 @@ sub save {
sub save_tmp {
my $self = shift;
my $filename=$ENV{'user.name'}.'_'.
- $ENV{'user.domain'}.'_spreadsheet_'.$self->{'usymb'}.'_'.
+ $ENV{'user.domain'}.'_spreadsheet_'.$self->{'symb'}.'_'.
$self->{'filename'};
$filename=~s/\W/\_/g;
$filename=$Apache::lonnet::tmpdir.$filename.'.tmp';
@@ -1650,7 +1670,7 @@ sub save_tmp {
sub load_tmp {
my $self = shift;
my $filename=$ENV{'user.name'}.'_'.
- $ENV{'user.domain'}.'_spreadsheet_'.$self->{'usymb'}.'_'.
+ $ENV{'user.domain'}.'_spreadsheet_'.$self->{'symb'}.'_'.
$self->{'filename'};
$filename=~s/\W/\_/g;
$filename=$Apache::lonnet::tmpdir.$filename.'.tmp';
|