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

Diff for /loncom/interface/spreadsheet/assesscalc.pm between versions 1.4 and 1.6

version 1.4, 2003/05/22 20:23:56 version 1.6, 2003/05/23 14:08:40
Line 523  sub compute { Line 523  sub compute {
     my %f=$self->formulas();      my %f=$self->formulas();
     my %c;      my %c;
     #      #
       # Check for blackout requirements
       if ((!exists($ENV{'request.role.adv'}) || !$ENV{'request.role.adv'})) {
           while (my ($parm,$value) = each(%parameters)) {
               last if ($self->blackout());
               next if ($parm !~ /^(parameter_.*)_problemstatus$/);
               next if ($parameters{$1.'_answerdate'}<time);
               if (lc($value) eq 'no') {
                   # We must blackout this sheet
                   $self->blackout(1);
               }
           }
       }
       #
       # Move the parameters into the spreadsheet
     while (my ($parm,$value) = each(%parameters)) {      while (my ($parm,$value) = each(%parameters)) {
         my $cell = 'A'.$self->get_row_number_from_key($parm);          my $cell = 'A'.$self->get_row_number_from_key($parm);
         $f{$cell} = $parm;          $f{$cell} = $parm;
         $c{$parm} = '';          $value = '"'.$value.'"' if ($value =~/[^0-9.]/);
         if ($value ne '') {          $c{$parm} = $value;
             $c{$parm} = '"'.$value.'"';  
         }  
     }      }
     $self->formulas(%f);      $self->formulas(\%f);
     $self->constants(%c);      $self->constants(\%c);
     $self->calcsheet();      $self->calcsheet();
     #      #
     # Store export row in cache      # Store export row in cache
Line 652  spreadsheet only if necessary. Line 664  spreadsheet only if necessary.
 sub export_data {  sub export_data {
     my $self = shift;      my $self = shift;
     my $symb = $self->{'symb'};      my $symb = $self->{'symb'};
     if (! exists($Exportrows{$symb}) || ! defined($Exportrows{$symb})  ||      if (! exists($ENV{'request.role.adv'}) || ! $ENV{'request.role.adv'} ||
           ! exists($Exportrows{$symb}) || ! defined($Exportrows{$symb})  ||
         ! $self->check_expiration_time($Exportrows{$symb}->{'time'}) ||          ! $self->check_expiration_time($Exportrows{$symb}->{'time'}) ||
         ! exists($Exportrows{$symb}->{$self->{'filename'}}) ||          ! exists($Exportrows{$symb}->{$self->{'filename'}}) ||
         ! defined($Exportrows{$symb}->{$self->{'filename'}})) {          ! defined($Exportrows{$symb}->{$self->{'filename'}})) {
Removed from v.1.4  
changed lines
  Added in v.1.6

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