--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/12 16:48:21	1.15
+++ loncom/interface/Attic/lonspreadsheet.pm	2000/12/18 13:45:40	1.17
@@ -2,7 +2,7 @@
 # Spreadsheet/Grades Display Handler
 #
 # 11/11,11/15,11/27,12/04,12/05,12/06,12/07,
-# 12/08,12/09,12/11,12/12 Gerd Kortemeyer
+# 12/08,12/09,12/11,12/12,12/15,12/16,12/18 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
 
@@ -260,9 +260,15 @@ sub SUMMIN {
 
 sub sett {
     %t=();
+    my $pattern='';
+    if ($sheettype eq 'assesscalc') {
+	$pattern='A';
+    } else {
+        $pattern='[A-Z]';
+    }
     map {
 	if ($f{$_}) {
-            if ($_=~/^A/) {
+            if ($_=~/^$pattern/) {
 	        unless ($f{$_}=~/^\!/) {
 		    $t{$_}=$c{$_};
                 }
@@ -273,6 +279,9 @@ sub sett {
             }
         }
     } keys %f;
+    $t{'A0'}=$f{'A0'};
+    $t{'A0'}=~s/\.\.+/\,/g;
+    $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
 }
 
 sub calc {
@@ -300,7 +309,7 @@ sub calc {
     return '';
 }
 
-sub outrow {
+sub outrowassess {
     my $n=shift;
     my @cols=();
     if ($n) {
@@ -436,13 +445,19 @@ sub rown {
     my $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
     my $rowdata="\n<tr><td><b><font size=+1>$n</font></b></td>";
     my $showf=0;
+    my $proc;
+    if (&gettype($safeeval) eq 'assesscalc') {
+        $proc='&outrowassess';
+    } else {
+        $proc='&outrow';
+    }
     map {
        my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
        my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
        if ($showf==0) { $vl=$_; }
        if ($showf<=1) { $bgcolor='#FFDDDD'; }
        if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } 
-       if ($showf>1) {
+       if (($showf>1) || ((!$n) && ($showf>0))) {
 	   if ($vl eq '') {
 	       $vl='<font size=+2 color='.$bgcolor.'>&#35;</font>';
            }
@@ -453,7 +468,7 @@ sub rown {
            $rowdata.='<td bgcolor='.$bgcolor.'>&nbsp;'.$vl.'&nbsp;</td>';
        }
        $showf++;
-    } $safeeval->reval('&outrow('.$n.')');
+    } $safeeval->reval($proc.'('.$n.')');
     return $rowdata.'</tr>';
 }
 
@@ -722,7 +737,7 @@ sub updaterows {
 	    if ($_=~/^A(\d+)/) {
                 $maxrow=($1>$maxrow)?$1:$maxrow;
                 $existing{$f{$_}}=1;
-		unless (defined($current{$f{$_}})) {
+		unless ((defined($current{$f{$_}})) || (!$1)) {
 		   $f{$_}='!!! Obsolete';
                    $changed=1;
                 }
@@ -749,6 +764,37 @@ sub updaterows {
     }
 }
 
+# --------------------------------------------------- Load data for one student
+
+sub rowazstudent {
+    my $safeeval=shift;
+    my %c=();
+    my %f=&getformulas($safeeval);
+    map {
+	if ($_=~/^A(\d+)/) {
+	   my $row=$1;
+           unless ($f{$_}=~/^\!/) {
+              my @assessdata=split(/\,/,
+                             &Apache::lonnet::ssi(
+        '/res/msu/korte/junk.assesscalc',('utarget' => 'export',
+                                          'uname'   => $uname,
+                                          'udom'    => $udom,
+			                  'usymb'   => $f{$_})));
+              my $index=0;
+              map {
+		  $c{$_.$row}=$assessdata[$index];
+		  print $_.':'.$c{$_.$row}.'<br>';
+                  $index++;
+              } ('A','B','C','D','E','F','G','H','I','J','K','L','M',
+                 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z');
+              
+	   }
+        }
+    } keys %f;
+
+    &setconstants($safeeval,%c);
+}
+
 # ------------------------------------------------ Load data for one assessment
 
 sub rowaassess {
@@ -881,6 +927,7 @@ sub handler {
       ($ENV{'request.state'} eq 'construct')) { 
 
 # --------------------------- Get query string for limited number of parameters
+
     map {
        my ($name, $value) = split(/=/,$_);
        $value =~ tr/+/ /;
@@ -903,7 +950,7 @@ sub handler {
     }
 # ----------------------------------------------------------- Change of target?
 
-    my $reroute=($ENV{'utarget'} eq 'export');
+    my $reroute=($ENV{'form.utarget'} eq 'export');
 
 # ------------------------------------------------------------------- Open page
 
@@ -947,12 +994,12 @@ ENDSCRIPT
         $ENV{'form.unewformula'}=~s/\'/\"/g;
         $r->print('New formula: '.$ENV{'form.unewfield'}.'='.
                   $ENV{'form.unewformula'}.'<br>');
-	&tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/',
-                 $ENV{'form.usymb'},
-                 $ENV{'form.unewfield'},$ENV{'form.unewformula'});
         &setfilename($sheetone,$r->filename);
         $r->filename=~/\.(\w+)/;
         &settype($sheetone,$1);
+	&tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/',
+                 $ENV{'form.usymb'},
+                 $ENV{'form.unewfield'},$ENV{'form.unewformula'});
     } else {
         &readsheet($sheetone,$r->filename);
     }
@@ -991,6 +1038,8 @@ ENDSCRIPT
 
     if (&gettype($sheetone) eq 'assesscalc') {
 	&rowaassess($sheetone,$ENV{'form.usymb'});
+    } elsif  (&gettype($sheetone) eq 'studentcalc') {
+	&rowazstudent($sheetone);
     }
     &calcsheet($sheetone);