--- loncom/interface/Attic/lonspreadsheet.pm	2001/03/20 20:11:27	1.47
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/03/21 15:38:47	1.51
@@ -5,7 +5,7 @@
 # 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30,
 # 01/01/01,02/01,03/01,19/01,20/01,22/01,
 # 03/05,03/08,03/10,03/12,03/13,03/15,03/17,
-# 03/19,03/20 Gerd Kortemeyer
+# 03/19,03/20,03/21 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
             
@@ -1096,6 +1096,13 @@ sub updatestudentassesssheet {
 	my %allkeys=();
         my %allassess=();
 
+        my $adduserstr='';
+        if ((&getuname($safeeval) ne $ENV{'user.name'}) ||
+            (&getudom($safeeval) ne $ENV{'user.domain'})) {
+            $adduserstr='&uname='.&getuname($safeeval).
+		'&udom='.&getudom($safeeval);
+        }
+
         map {
 	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
 	       my $mapid=$1;
@@ -1108,7 +1115,8 @@ sub updatestudentassesssheet {
 			    '___'.$resid.'___'.
 			    &Apache::lonnet::declutter($srcf);
 		 $allassess{$symb}=
-    '<a href="/adm/assesscalc?usymb='.$symb.'">'.$bighash{'title_'.$id}.'</a>';
+	            '<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'.
+                     $bighash{'title_'.$id}.'</a>';
                  if ($stype eq 'assesscalc') {
                    map {
                        if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) {
@@ -1260,7 +1268,7 @@ sub loadcourse {
 <script>
     popwin=open('','popwin','width=400,height=100');
     popwin.document.writeln('<html><body bgcolor="#FFFFFF">'+
-      '<h1>Spreadsheet Calculation Progress</h1>'+
+      '<h3>Spreadsheet Calculation Progress</h3>'+
       '<form name=popremain>'+
       '<input type=text size=35 name=remaining value=Starting></form>'+
       '</body></html>');
@@ -1504,12 +1512,14 @@ sub forcedrecalc {
         if (&checkthis('::assesscalc:',$time) ||
             &checkthis('::assesscalc:'.$map,$time) ||
             &checkthis('::assesscalc:'.$usymb,$time) ||
-            &checkthis($uname.':'.$udom.':assesscalc:',$time)) {
+            &checkthis($uname.':'.$udom.':assesscalc:',$time) ||
+            &checkthis($uname.':'.$udom.':assesscalc:'.$map,$time) ||
+            &checkthis($uname.':'.$udom.':assesscalc:'.$usymb,$time)) {
             return 1;
         } 
     } else {
         if (&checkthis('::studentcalc:',$time) || 
-            &checkthis($uname.':'.$udom.':studencalc:',$time)) {
+            &checkthis($uname.':'.$udom.':studentcalc:',$time)) {
 	    return 1;
         }
     }
@@ -1637,6 +1647,27 @@ sub exportsheet {
  }
  return @exportarr;
 }
+# ============================================================ Expiration Dates
+#
+# Load previously cached student spreadsheets for this course
+#
+
+sub expirationdates {
+    undef %expiredates;
+    my $cid=$ENV{'request.course.id'};
+    my $reply=&Apache::lonnet::reply('dump:'.
+				     $ENV{'course.'.$cid.'.domain'}.':'.
+                                     $ENV{'course.'.$cid.'.num'}.
+				     ':nohist_expirationdates',
+                                     $ENV{'course.'.$cid.'.home'});
+    unless ($reply=~/^error\:/) {
+	map {
+            my ($name,$value)=split(/\=/,$_);
+            $expiredates{&Apache::lonnet::unescape($name)}
+                        =&Apache::lonnet::unescape($value);
+        } split(/\&/,$reply);
+    }
+}
 
 # ===================================================== Calculated sheets cache
 #
@@ -1858,6 +1889,8 @@ ENDSCRIPT
 
 # --------------------------------------------------------------- Cached sheets
 
+    &expirationdates();
+
     undef %oldsheets;
     undef %loadedcaches;
 
