--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/18 17:14:49	1.18
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/01/01 16:16:08	1.23
@@ -2,7 +2,8 @@
 # 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,12/18 Gerd Kortemeyer
+# 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30,
+# 01/01/01 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
 
@@ -12,8 +13,8 @@ use Safe::Hole;
 use Opcode;
 use Apache::lonnet;
 use Apache::Constants qw(:common :http);
-use HTML::TokeParser;
 use GDBM_File;
+use HTML::TokeParser;
 
 #
 # These cache hashes need to be independent of user, resource and course
@@ -267,7 +268,26 @@ sub sett {
         $pattern='[A-Z]';
     }
     map {
-	if ($f{$_}) {
+	if ($_=~/template\_(\w)/) {
+	  my $col=$1;
+          unless ($col=~/^$pattern/) {
+            map {
+	      if ($_=~/A(\d+)/) {
+		my $trow=$1;
+                if ($trow) {
+		    my $lb=$col.$trow;
+                    $t{$lb}=$f{'template_'.$col};
+                    $t{$lb}=~s/\#/$trow/g;
+                    $t{$lb}=~s/\.\.+/\,/g;
+                    $t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+                }
+	      }
+            } keys %f;
+	  }
+      }
+    } keys %f;
+    map {
+	if (($f{$_}) && ($_!~/template\_/)) {
             if ($_=~/^$pattern/) {
 	        unless ($f{$_}=~/^\!/) {
 		    $t{$_}=$c{$_};
@@ -309,6 +329,20 @@ sub calc {
     return '';
 }
 
+sub templaterow {
+    my @cols=();
+    $cols[0]='<b><font size=+1>Template</font></b>';
+    map {
+        my $fm=$f{'template_'.$_};
+        $fm=~s/[\'\"]/\&\#34;/g;
+        $cols[$#cols+1]="'template_$_','$fm'".'___eq___'.$fm;
+    } ('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 outrowassess {
     my $n=shift;
     my @cols=();
@@ -332,7 +366,7 @@ sub outrow {
     my $n=shift;
     my @cols=();
     if ($n) {
-       $cols[0]=$rl{$f{'A'.$n}}.' stuff';
+       $cols[0]=$rl{$f{'A'.$n}};
     } else {
        $cols[0]='<b><font size=+1>Export</font></b>';
     }
@@ -461,7 +495,12 @@ sub exportrow {
 
 sub rown {
     my ($safeeval,$n)=@_;
-    my $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
+    my $defaultbg;
+    unless ($n eq '-') {
+       $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
+    } else {
+       $defaultbg='#E0FF';
+    }
     my $rowdata="\n<tr><td><b><font size=+1>$n</font></b></td>";
     my $showf=0;
     my $proc;
@@ -473,6 +512,7 @@ sub rown {
         $proc='&outrow';
         $maxred=26;
     }
+    if ($n eq '-') { $proc='&templaterow'; $n=-1; }
     map {
        my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
        my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
@@ -533,6 +573,7 @@ sub outsheet {
     $tabledata.='</tr>';
     my $row;
     my $maxrow=&getmaxrow($safeeval);
+    $tabledata.=&rown($safeeval,'-');
     for ($row=0;$row<=$maxrow;$row++) {
         $tabledata.=&rown($safeeval,$row);
     }
@@ -541,43 +582,95 @@ sub outsheet {
 
 
 
-# --------------------------------------- Read spreadsheet formulas from a file
+# ------------------------------------- Read spreadsheet formulas from a course
 
 sub readsheet {
-    my ($safeeval,$fn)=@_;
-    &setfilename($safeeval,$fn);
-    $fn=~/\.(\w+)/;
-    &settype($safeeval,$1);
+    my ($safeeval,$fn,$r)=@_;
     my %f=();
-    unless ($spreadsheets{$fn}) {
-       $spreadsheets{$fn}='';
+    if (($fn eq '') || ($fn=~/^default\_/)) {
+	my $sheetxml='';
        {
          my $fh;
-         if ($fh=Apache::File->new($fn)) {
-            $spreadsheets{$fn}=join('',<$fh>);
-         }
+         if ($fh=Apache::File->new($r->dir_config('lonIncludes').
+                         '/default.'.&gettype($safeeval))) {
+               $sheetxml=join('',<$fh>);
+          }
        }
+       my $parser=HTML::TokeParser->new(\$sheetxml);
+       my $token;
+       while ($token=$parser->get_token) {
+          if ($token->[0] eq 'S') {
+ 	     if ($token->[1] eq 'field') {
+ 		 $f{$token->[2]->{'col'}.$token->[2]->{'row'}}=
+ 		     $parser->get_text('/field');
+ 	     }
+             if ($token->[1] eq 'template') {
+                 $f{'template_'.$token->[2]->{'col'}}=
+                     $parser->get_text('/template');
+             }
+          }
+       }
+       &setfilename($safeeval,'default_'.&gettype($safeeval));
+    } else {
+       &setfilename($safeeval,$fn);
+       unless ($spreadsheets{$fn}) {
+          $spreadsheets{$fn}='';
+          my $reply=&Apache::lonnet::reply('dump:'.
+              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
+              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'.$fn,
+              $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+          unless ($reply=~/^error\:/) {
+             $spreadsheets{$fn}=$reply;
+          }
+       }
+       map {
+           my ($name,$value)=split(/\=/,$_);
+           $f{&Apache::lonnet::unescape($name)}=
+	      &Apache::lonnet::unescape($value);
+       } split(/\&/,$spreadsheets{$fn});
     }
-    {
-      my $parser=HTML::TokeParser->new(\$spreadsheets{$fn});
-      my $token;
-      while ($token=$parser->get_token) {
-         if ($token->[0] eq 'S') {
-	     if ($token->[1] eq 'field') {
-		 $f{$token->[2]->{'col'}.$token->[2]->{'row'}}=
-		     $parser->get_text('/field');
-	     }
-         }
-      }
-    }
+
     &setformulas($safeeval,%f);
 }
 
+# ------------------------------------------------------------ Save spreadsheet
+
+sub writesheet {
+  my $safeeval=shift;
+  if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+    my %f=&getformulas($safeeval);
+    my $sheetdata='';
+    map {
+       $sheetdata.=&Apache::lonnet::escape($_).'='.
+	   &Apache::lonnet::escape($f{$_}).'&';
+    } keys %f;
+    $sheetdata=~s/\&$//;
+    my $reply=&Apache::lonnet::reply('put:'.
+              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
+              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'.
+              &getfilename($safeeval).':'.
+              $sheetdata,
+              $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+    if ($reply eq 'ok') {
+          return &Apache::lonnet::reply('put:'.
+              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
+              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'.
+              &gettype($safeeval).'_spreadsheets:'.
+              &Apache::lonnet::escape(&getfilename($safeeval)).'='.
+              $ENV{'user.name'},
+              $ENV{'course.'.$ENV{'request.course.id'}.'.home'});    
+      } else {
+	  return $reply;
+      }
+  }
+  return 'unauthorized';
+}
+
 # ----------------------------------------------- Make a temp copy of the sheet
 
 sub tmpwrite {
     my ($safeeval,$tmpdir,$symb)=@_;
-    my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval);
+    my $fn=$uname.'_'.$udom.'_spreadsheet_'.$symb.'_'.&getfilename($safeeval);
     $fn=~s/\W/\_/g;
     $fn=$tmpdir.$fn.'.tmp';
     my $fh;
@@ -590,7 +683,7 @@ sub tmpwrite {
 
 sub tmpread {
     my ($safeeval,$tmpdir,$symb,$nfield,$nform)=@_;
-    my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval);
+    my $fn=$uname.'_'.$udom.'_spreadsheet_'.$symb.'_'.&getfilename($safeeval);
     $fn=~s/\W/\_/g;
     $fn=$tmpdir.$fn.'.tmp';
     my $fh;
@@ -604,7 +697,7 @@ sub tmpread {
             $fo{$name}=$value;
         }
     }
-    $fo{$nfield}=$nform;
+    if ($nfield) { $fo{$nfield}=$nform; }
     &setformulas($safeeval,%fo);
 }
 
@@ -711,7 +804,67 @@ sub parmval {
         
 }
 
+# ---------------------------------------------- Update rows for course listing
 
+sub updatestudentrows {
+    my $safeeval=shift;
+    my $cid=$ENV{'request.course.id'};
+    my $classlst=&Apache::lonnet::reply
+                 ('dump:'.$ENV{'course.'.$cid.'.domain'}.':'.
+	                  $ENV{'course.'.$cid.'.num'}.':classlist',
+	                  $ENV{'course.'.$cid.'.home'});
+    my %currentlist=();
+    my $now=time;
+    unless ($classlst=~/^error\:/) {
+        map {
+            my ($name,$value)=split(/\=/,$_);
+            my ($end,$start)=split(/\_/,&Apache::lonnet::unescape($value));
+            my $active=1;
+            if (($end) && ($now>$end)) { $active=0; }
+            if ($active) {
+		$currentlist{&Apache::lonnet::unescape($name)}=1;
+            }
+        } split(/\&/,$classlst);
+#
+# -------------------- Find discrepancies between the course row table and this
+#
+        my %f=&getformulas($safeeval);
+        my $changed=0;
+
+        my $maxrow=0;
+        my %existing=();
+
+# ----------------------------------------------------------- Now obsolete rows
+	map {
+	    if ($_=~/^A(\d+)/) {
+                $maxrow=($1>$maxrow)?$1:$maxrow;
+                $existing{$f{$_}}=1;
+		unless ((defined($currentlist{$f{$_}})) || (!$1)) {
+		   $f{$_}='!!! Obsolete';
+                   $changed=1;
+                }
+            }
+        } keys %f;
+
+# -------------------------------------------------------- New and unknown keys
+     
+        map {
+            unless ($existing{$_}) {
+		$changed=1;
+                $maxrow++;
+                $f{'A'.$maxrow}=$_;
+            }
+        } keys %currentlist;        
+     
+        if ($changed) { &setformulas($safeeval,%f); }
+
+        &setmaxrow($safeeval,$maxrow);
+        &setrowlabels($safeeval,%currentlist);
+
+    } else {
+        return 'Could not access course data';
+    }
+}
 # ----------------------------------------------------------------- Update rows
 
 sub updaterows {
@@ -981,7 +1134,8 @@ sub handler {
        my ($name, $value) = split(/=/,$_);
        $value =~ tr/+/ /;
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-       if (($name eq 'uname') || ($name eq 'udom') || ($name eq 'usymb')) {
+       if (($name eq 'uname') || ($name eq 'udom') || 
+           ($name eq 'usymb') || ($name eq 'ufn')) {
            unless ($ENV{'form.'.$name}) {
               $ENV{'form.'.$name}=$value;
 	   }
@@ -989,7 +1143,6 @@ sub handler {
     } (split(/&/,$ENV{'QUERY_STRING'}));
 
 # ------------------------------------------- Nothing there? Must be login user
-
     unless ($ENV{'form.uname'}) {
 	$uname=$ENV{'user.name'};
         $udom=$ENV{'user.domain'};
@@ -1027,6 +1180,8 @@ sub handler {
 </script>
 ENDSCRIPT
     $r->print('</head><body bgcolor="#FFFFFF">'.
+       '<img align=right src=/adm/lonIcons/lonlogos.gif>'.
+       '<h1>LON-CAPA Spreadsheet</h1>'.
        '<form action="'.$r->uri.'" name=sheet method=post>'.
        &hiddenfield('uname',$ENV{'form.uname'}).
        &hiddenfield('udom',$ENV{'form.udom'}).
@@ -1038,22 +1193,31 @@ ENDSCRIPT
 # ---------------------------------------- Read new sheet or modified worksheet
 
     my $sheetone=initsheet();
+    $r->uri=~/\/(\w+)$/;
+    &settype($sheetone,$1);
     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>');
-        &setfilename($sheetone,$r->filename);
-        $r->filename=~/\.(\w+)/;
-        &settype($sheetone,$1);
+        $r->print('<p>New formula: '.$ENV{'form.unewfield'}.'='.
+                  $ENV{'form.unewformula'}.'<p>');
+        &setfilename($sheetone,$ENV{'form.ufn'});
 	&tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/',
                  $ENV{'form.usymb'},
                  $ENV{'form.unewfield'},$ENV{'form.unewformula'});
+    } elsif ($ENV{'form.saveas'}) {
+        &setfilename($sheetone,$ENV{'form.ufn'});
+	&tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/',
+                 $ENV{'form.usymb'});
     } else {
-        &readsheet($sheetone,$r->filename);
+        &readsheet($sheetone,$ENV{'form.ufn'},$r);
+        $ENV{'form.ufn'}=&getfilename($sheetone);
     }
 
-# --------------------------------------------- See if all import rows uptodate
+  if (&gettype($sheetone) eq 'classcalc') {
+# ---------------------------------- For course view: get courselist and update
+       &updatestudentrows($sheetone);
+  } else {
+# ----------------- For assessment and student: See if all import rows uptodate
 
     if (tie(%parmhash,'GDBM_File',
        $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640)) {
@@ -1068,7 +1232,22 @@ ENDSCRIPT
        $r->print('<h3><font color=red>'.
 	   'Could not initialize import fields (not in a course)</font></h3>');
    }
-
+ }
+# ---------------------------------------------------- See if something to save
+    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+        my $fname='';
+	if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) {
+            $fname=~s/\W/\_/g;
+            if ($fname eq 'default') { $fname='course_default'; }
+            $fname.='_'.&gettype($sheetone);
+            &setfilename($sheetone,$fname);
+            $ENV{'form.ufn'}=$fname;
+            my $reply=&writesheet($sheetone);
+            unless ($reroute) {
+		$r->print('<p>Saving spreadsheet: '.$reply.'<p>');
+            }
+        }
+    }
 # ------------------------------------------------ Write the modified worksheet
 
    &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/',
@@ -1076,12 +1255,22 @@ ENDSCRIPT
 
 # ----------------------------------------------------- Print user, course, etc
    unless ($reroute) {
-    $r->print("<b>User '$uname' at domain '$udom' for '".
-              $ENV{'course.'.$ENV{'request.course.id'}.'.description'}."'");
+    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+        my $fname=$ENV{'form.ufn'};
+        $fname=~s/\_[^\_]+$//;
+        if ($fname eq 'default') { $fname='course_default'; }
+        $r->print('<input type=submit name=saveas value="Save as ...">'.
+              '<input type=text size=20 name=newfn value="'.$fname.'"><p>');
+    }
+    $r->print(&hiddenfield('ufn',$ENV{'form.ufn'}));
+    unless (&gettype($sheetone) eq 'classcalc') {
+        $r->print('<br><b>User:</b> '.$uname.'<br><b>Domain:</b> '.$udom);
+    }
+    $r->print('<h1>'.
+            $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.'</h1>');
     if ($csec) {
-       $r->print(", group/section '$csec'");
+       $r->print('<h3>Group/Section: '.$csec.'</h3>');
     }
-    $r->print("</b>\n");
    }
 # -------------------------------------------------------- Import and calculate