--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/16 21:34:47	1.16
+++ loncom/interface/Attic/lonspreadsheet.pm	2000/12/18 17:14:49	1.18
@@ -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,12/15,12/16 Gerd Kortemeyer
+# 12/08,12/09,12/11,12/12,12/15,12/16,12/18 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
 
@@ -279,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 {
@@ -325,13 +328,32 @@ sub outrowassess {
     return @cols;
 }
 
+sub outrow {
+    my $n=shift;
+    my @cols=();
+    if ($n) {
+       $cols[0]=$rl{$f{'A'.$n}}.' stuff';
+    } else {
+       $cols[0]='<b><font size=+1>Export</font></b>';
+    }
+    map {
+        my $fm=$f{$_.$n};
+        $fm=~s/[\'\"]/\&\#34;/g;
+        $cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n};
+    } ('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',
+       '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');
+    return @cols;
+}
+
 sub exportrowa {
     my $rowa='';
     map {
-	$rowa.=$v{$_.'0'}."','";
+	$rowa.=$v{$_.'0'}."___;___";
     } ('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');
-    $rowa=~s/\'\,\'$//;
+    $rowa=~s/\_\_\_\;\_\_\_$//;
     return $rowa;
 }
 
@@ -443,18 +465,21 @@ sub rown {
     my $rowdata="\n<tr><td><b><font size=+1>$n</font></b></td>";
     my $showf=0;
     my $proc;
+    my $maxred;
     if (&gettype($safeeval) eq 'assesscalc') {
         $proc='&outrowassess';
+        $maxred=1;
     } else {
         $proc='&outrow';
+        $maxred=26;
     }
     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 ($showf<=$maxred) { $bgcolor='#FFDDDD'; }
        if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } 
-       if ($showf>1) {
+       if (($showf>$maxred) || ((!$n) && ($showf>0))) {
 	   if ($vl eq '') {
 	       $vl='<font size=+2 color='.$bgcolor.'>&#35;</font>';
            }
@@ -473,11 +498,35 @@ sub rown {
 
 sub outsheet {
     my $safeeval=shift;
-    my $tabledata='<table border=2><tr><td colspan=2>&nbsp;</td>'.
-                  '<td bgcolor=#FFDDDD><b>A Import</b></td>';
+    my $maxred;
+    my $realm;
+    if (&gettype($safeeval) eq 'assesscalc') {
+        $maxred=1;
+        $realm='Assessment';
+    } elsif (&gettype($safeeval) eq 'studentcalc') {
+        $maxred=26;
+        $realm='User';
+    } else {
+        $maxred=26;
+        $realm='Course';
+    }
+    my $maxyellow=52-$maxred;
+    my $tabledata='<table border=2><tr><th colspan=2 rowspan=2><font size=+2>'.
+                  $realm.'</font></th>'.
+                  '<td bgcolor=#FFDDDD colspan='.$maxred.
+                  '><b><font size=+1>Import</font></b></td>'.
+                  '<td colspan='.$maxyellow.
+		  '><b><font size=+1>Calculations</font></b></td></tr><tr>';
+    my $showf=0;
     map {
-        $tabledata.="<td><b><font size=+1>$_</font></b></td>";
-    } ('B','C','D','E','F','G','H','I','J','K','L','M',
+        $showf++;
+        if ($showf<=$maxred) { 
+           $tabledata.='<td bgcolor="#FFDDDD">'; 
+        } else {
+           $tabledata.='<td>';
+        }
+        $tabledata.="<b><font size=+1>$_</font></b></td>";
+    } ('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',
        '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');
@@ -734,7 +783,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;
                 }
@@ -768,18 +817,30 @@ sub rowazstudent {
     my %c=();
     my %f=&getformulas($safeeval);
     map {
-	if ($_=~/^A/) {
+	if ($_=~/^A(\d+)/) {
+	   my $row=$1;
            unless ($f{$_}=~/^\!/) {
-              print &Apache::lonnet::ssi(
+              my @assessdata=split(/\_\_\_\;\_\_\_/,
+                             &Apache::lonnet::ssi(
         '/res/msu/korte/junk.assesscalc',('utarget' => 'export',
                                           'uname'   => $uname,
                                           'udom'    => $udom,
-			                  'usymb'   => $f{$_})).
-              '<br>'.$f{$_}.'<br>';
+			                  'usymb'   => $f{$_})));
+              my $index=0;
+              map {
+                  if ($assessdata[$index]) {
+		     $c{$_.$row}=$assessdata[$index];
+                     unless ($_ eq 'A') { 
+			 $f{$_.$row}='import';
+                     }
+		  }
+                  $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;
-
+    &setformulas($safeeval,%f);
     &setconstants($safeeval,%c);
 }
 
@@ -915,6 +976,7 @@ sub handler {
       ($ENV{'request.state'} eq 'construct')) { 
 
 # --------------------------- Get query string for limited number of parameters
+
     map {
        my ($name, $value) = split(/=/,$_);
        $value =~ tr/+/ /;
@@ -981,12 +1043,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);
     }
@@ -1028,7 +1090,10 @@ ENDSCRIPT
     } elsif  (&gettype($sheetone) eq 'studentcalc') {
 	&rowazstudent($sheetone);
     }
-    &calcsheet($sheetone);
+    my $calcoutput=&calcsheet($sheetone);
+    unless ($reroute) {
+       $r->print('<h3><font color=red>'.$calcoutput.'</h3></font>');
+    }
 
 # ------------------------------------------------------- Print or export sheet
    unless ($reroute) {   
@@ -1036,7 +1101,7 @@ ENDSCRIPT
 
     $r->print('</form></body></html>');
   } else {
-      $r->print(&exportrow($sheetone));
+     $r->print(&exportrow($sheetone));
   }
 # ------------------------------------------------------------------------ Done
   } else {