--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/11 16:51:12	1.12
+++ loncom/interface/Attic/lonspreadsheet.pm	2000/12/18 13:45:40	1.17
@@ -1,7 +1,8 @@
 # The LearningOnline Network with CAPA
 # Spreadsheet/Grades Display Handler
 #
-# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,12/08,12/09,12/11 Gerd Kortemeyer
+# 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,12/18 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
 
@@ -259,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{$_};
                 }
@@ -272,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 {
@@ -299,7 +309,7 @@ sub calc {
     return '';
 }
 
-sub outrow {
+sub outrowassess {
     my $n=shift;
     my @cols=();
     if ($n) {
@@ -318,6 +328,16 @@ sub outrow {
     return @cols;
 }
 
+sub exportrowa {
+    my $rowa='';
+    map {
+	$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/\'\,\'$//;
+    return $rowa;
+}
+
 # ------------------------------------------- End of "Inside of the safe space"
 ENDDEFS
     $safeeval->reval($code);
@@ -406,7 +426,14 @@ sub getfilename {
     my $safeeval=shift;
     return $safeeval->reval('$filename');
 }
-    
+
+# ------------------------------------------------------------- Export of A-row
+
+sub exportrow {
+    my $safeeval=shift;
+    return $safeeval->reval('&exportrowa()');
+}
+
 # ========================================================== End of Spreadsheet
 # =============================================================================
 
@@ -418,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>';
            }
@@ -435,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>';
 }
 
@@ -704,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;
                 }
@@ -731,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 {
@@ -741,7 +805,9 @@ sub rowaassess {
 
 # ----------------------------------------------------------- Get stored values
     my $answer=&Apache::lonnet::reply(
-       "restore:$udom:$uname:$namespace:$symb",$uhome);
+       "restore:$udom:$uname:".
+       &Apache::lonnet::escape($namespace).":".
+       &Apache::lonnet::escape($symb),$uhome);
     my %returnhash=();
     map {
 	my ($name,$value)=split(/\=/,$_);
@@ -762,13 +828,15 @@ sub rowaassess {
     my $uhome=&Apache::lonnet::homeserver($uname,$udom);
     unless ($uhome eq 'no_host') { 
 # -------------------------------------------------------------- Get coursedata
-      unless ($courserdatas{$ENV{'request.course.id'}}) {
+      unless
+        ((time-$courserdatas{$ENV{'request.course.id'}.'.last_cache'})<120) {
          my $reply=&Apache::lonnet::reply('dump:'.
               $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
               $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata',
               $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
          if ($reply!~/^error\:/) {
             $courserdatas{$ENV{'request.course.id'}}=$reply;
+            $courserdatas{$ENV{'request.course.id'}.'.last_cache'}=time;
          }
       }
       map {
@@ -777,17 +845,19 @@ sub rowaassess {
                     &Apache::lonnet::unescape($value);  
       } split(/\&/,$courserdatas{$ENV{'request.course.id'}});
 # --------------------------------------------------- Get userdata (if present)
-      unless ($userrdatas{$uname.'___'.$udom}) {
+      unless
+        ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<120) {
          my $reply=
        &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
          if ($reply!~/^error\:/) {
 	     $userrdatas{$uname.'___'.$udom}=$reply;
+	     $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
          }
       }
       map {
          my ($name,$value)=split(/\=/,$_);
          $useropt{&Apache::lonnet::unescape($name)}=
-                  &Apache::lonnet::unescape($value);
+	          &Apache::lonnet::unescape($value);
       } split(/\&/,$userrdatas{$uname.'___'.$udom});
    }
 # -- now courseopt, useropt initialized for this user and course (used parmval)
@@ -800,7 +870,10 @@ sub rowaassess {
   	       if ($f{$_}=~/^parameter/) {
 	          $c{$_}=&parmval($f{$_},$symb);
 	       } else {
- 	          $c{$_}=$returnhash{$f{$_}};
+		  my $key=$f{$_};
+                  $key=~s/^stores\_/resource\./;
+                  $key=~s/\_/\./;
+ 	          $c{$_}=$returnhash{$key};
 	       }
 	   }
         }
@@ -833,8 +906,6 @@ sub selectbox {
     return $selout.'</select>';
 }
 
-# ==================================== Sub handler to get export of assessments
-
 # ================================================================ Main handler
 
 sub handler {
@@ -856,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/+/ /;
@@ -876,6 +948,10 @@ sub handler {
         $uname=$ENV{'form.uname'};
         $udom=$ENV{'form.udom'};
     }
+# ----------------------------------------------------------- Change of target?
+
+    my $reroute=($ENV{'form.utarget'} eq 'export');
+
 # ------------------------------------------------------------------- Open page
 
     $r->content_type('text/html');
@@ -883,6 +959,9 @@ sub handler {
     $r->header_out('Pragma','no-cache');
     $r->send_http_header;
 
+# --------------------------------------------------------------- Screen output
+
+  unless ($reroute) {
     $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
     $r->print(<<ENDSCRIPT);
 <script language="JavaScript">
@@ -905,21 +984,28 @@ ENDSCRIPT
        &hiddenfield('usymb',$ENV{'form.usymb'}).
        &hiddenfield('unewfield','').
        &hiddenfield('unewformula',''));
+  }
+
+# ---------------------------------------- Read new sheet or modified worksheet
+
     my $sheetone=initsheet();
     if ($ENV{'form.unewfield'}) {
         $r->print('<h2>Modified Workcopy</h2>');
         $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);
     }
+
+# --------------------------------------------- See if all import rows uptodate
+
     if (tie(%parmhash,'GDBM_File',
        $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640)) {
        $csec=&Apache::lonnet::usection($udom,$uname,$ENV{'request.course.id'});
@@ -933,22 +1019,39 @@ ENDSCRIPT
        $r->print('<h3><font color=red>'.
 	   'Could not initialize import fields (not in a course)</font></h3>');
    }
+
+# ------------------------------------------------ Write the modified worksheet
+
    &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/',
               $ENV{'form.usymb'});
+
+# ----------------------------------------------------- Print user, course, etc
+   unless ($reroute) {
     $r->print("<b>User '$uname' at domain '$udom' for '".
               $ENV{'course.'.$ENV{'request.course.id'}.'.description'}."'");
     if ($csec) {
        $r->print(", group/section '$csec'");
     }
     $r->print("</b>\n");
+   }
+# -------------------------------------------------------- Import and calculate
+
     if (&gettype($sheetone) eq 'assesscalc') {
 	&rowaassess($sheetone,$ENV{'form.usymb'});
+    } elsif  (&gettype($sheetone) eq 'studentcalc') {
+	&rowazstudent($sheetone);
     }
     &calcsheet($sheetone);
+
+# ------------------------------------------------------- Print or export sheet
+   unless ($reroute) {   
     $r->print(&outsheet($sheetone));
 
     $r->print('</form></body></html>');
-
+  } else {
+      $r->print(&exportrow($sheetone));
+  }
+# ------------------------------------------------------------------------ Done
   } else {
 # ----------------------------- Not in a course, or not allowed to modify parms
       $ENV{'user.error.msg'}=