[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.31 and 1.36

version 1.31, 2004/02/03 22:19:47 version 1.36, 2005/02/05 06:56:24
Line 337  sub parmval { Line 337  sub parmval {
     #      #
     # check course      # check course
     return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr}));      return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr}));
     return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm}));  
     return $courseopt{$courselevel}  if (defined($courseopt{$courselevel}));  
     # check map parms      # check map parms
     my $thisparm = $parmhash{$symbparm};      my $thisparm = $parmhash{$symbparm};
     return $thisparm if (defined($thisparm));      return $thisparm if (defined($thisparm));
     # check default      # check default
     $thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default');      $thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default');
     return $thisparm if (defined($thisparm));      return $thisparm if (defined($thisparm));
     #      # check more course
       return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm}));
       return $courseopt{$courselevel}  if (defined($courseopt{$courselevel}));
   
     # Cascade Up      # Cascade Up
     my $space=$what;      my $space=$what;
     $space=~s/\.\w+$//;      $space=~s/\.[^._]+$//;
     if ($space ne '0') {      if ($space ne '0') {
  my @parts=split(/_/,$space);   my @parts=split(/_/,$space);
  my $id=pop(@parts);   my $id=pop(@parts);
Line 397  sub get_full_title { Line 398  sub get_full_title {
     my @title = ($self->get_title());      my @title = ($self->get_title());
     # Look up the users identifying information      # Look up the users identifying information
     # Get the users information      # Get the users information
     my %userenv = &Apache::loncoursedata::GetUserName($self->{'name'},      my $name = &Apache::loncommon::plainname($self->{'name'},
                                                       $self->{'domain'});       $self->{'domain'});
     my $name =   
         join(' ',@userenv{'firstname','middlename','lastname','generation'});  
     $name =~ s/\s+$//;  
     push (@title,$name);      push (@title,$name);
     push (@title,&Apache::lonlocal::locallocaltime(time));      push (@title,&Apache::lonlocal::locallocaltime(time));
     return @title;      return @title;
Line 784  sub compute { Line 782  sub compute {
         if ($parm =~ /_submission$/ && $value =~ /(\{|\})/) {          if ($parm =~ /_submission$/ && $value =~ /(\{|\})/) {
             $value = 'witheld';              $value = 'witheld';
         }          }
         $value = 'q{'.$value.'}' if ($value !~/^\s*\d+(\.\d+)?\s*$/);          $value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/);
         $c{$parm} = $value;          $c{$parm} = $value;
     }      }
     $self->formulas(\%f);      $self->formulas(\%f);
Line 876  sub load_cached_export_rows { Line 874  sub load_cached_export_rows {
         # We only got one key, so we will access it directly.          # We only got one key, so we will access it directly.
         while (my ($key,$sheetdata) = each(%tmp)) {          while (my ($key,$sheetdata) = each(%tmp)) {
             my ($sname,$sdom,$sheettype,$symb) = split(':',$key);              my ($sname,$sdom,$sheettype,$symb) = split(':',$key);
               if (! defined($sname) || $sname eq '' ||
                   ! defined($sdom)  || $sdom eq '' ) {
                   next;
               }
             if ($symb =~ /\.time$/) {              if ($symb =~ /\.time$/) {
                 $symb =~ s/\.time$//;                  $symb =~ s/\.time$//;
                 $Exportrows{$symb}->{'time'} = $sheetdata;                  $Exportrows{$symb}->{'time'} = $sheetdata;
Removed from v.1.31  
changed lines
  Added in v.1.36

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