--- loncom/interface/Attic/lonspreadsheet.pm	2001/10/22 15:03:22	1.72
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/12/27 19:37:46	1.77
@@ -7,7 +7,7 @@
 # 03/05,03/08,03/10,03/12,03/13,03/15,03/17,
 # 03/19,03/20,03/21,03/27,04/05,04/09,
 # 07/09,07/14,07/21,09/01,09/10,9/11,9/12,9/13,9/14,9/17,
-# 10/16,10/17,10/20 Gerd Kortemeyer
+# 10/16,10/17,10/20,11/05,11/28,12/27 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
             
@@ -880,10 +880,13 @@ sub readsheet {
 	my $sheetxml='';
        {
          my $fh;
-         if ($fh=Apache::File->new($includedir.
-                         '/default.'.&gettype($safeeval))) {
+         my $dfn=$fn;
+         $dfn=~s/\_/\./g;
+         if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
                $sheetxml=join('',<$fh>);
-          }
+	 } else {
+             $sheetxml='<field row="0" col="A">"Error"</field>';
+	 }
        }
         my $parser=HTML::TokeParser->new(\$sheetxml);
         my $token;
@@ -1242,7 +1245,13 @@ sub updatestudentassesssheet {
 # --------------------------------------------------------- Get all assessments
 
 	my %allkeys=('timestamp' => 
-                     'Timestamp of Last Transaction<br>timestamp');
+                     'Timestamp of Last Transaction<br>timestamp',
+                     'subnumber' =>
+                     'Number of Submissions<br>subnumber',
+                     'tutornumber' =>
+                     'Number of Tutor Responses<br>tutornumber',
+                     'totalpoints' =>
+                     'Total Points Granted<br>totalpoints');
 
         my $adduserstr='';
         if ((&getuname($safeeval) ne $ENV{'user.name'}) ||
@@ -1259,7 +1268,10 @@ sub updatestudentassesssheet {
                        '">Evaluation</a>',
                        '_tutoring' =>
 	              '<a href="/adm/assesscalc?usymb=_tutoring'.$adduserstr.
-                       '">Tutoring</a>'
+                       '">Tutoring</a>',
+                       '_discussion' =>
+	              '<a href="/adm/assesscalc?usymb=_discussion'.$adduserstr.
+                       '">Discussion</a>'
         );
 
         map {
@@ -1535,6 +1547,18 @@ sub loadassessment {
    }
 # ----------------------------- returnhash now has all stores for this resource
 
+# --------- convert all "_" to "." to be able to use libraries, multiparts, etc
+
+    my @oldkeys=keys %returnhash;
+
+    map {
+        my $name=$_;
+        my $value=$returnhash{$_};
+        delete $returnhash{$_};
+        $name=~s/\_/\./g;
+        $returnhash{$name}=$value;
+    } @oldkeys;
+
 # ---------------------------- initialize coursedata and userdata for this user
     undef %courseopt;
     undef %useropt;
@@ -1713,6 +1737,11 @@ sub forcedrecalc {
 sub exportsheet {
  my ($uname,$udom,$stype,$usymb,$fn)=@_;
  my @exportarr=();
+
+ if (($usymb=~/^\_(\w+)/) && (!$fn)) {
+    $fn='default_'.$1;
+ }
+
 #
 # Check if cached
 #
@@ -2049,6 +2078,9 @@ ENDSCRIPT
         } else {
            $r->print('<br><b>Section/Group:</b> '.&getcsec($asheet));
         }
+        if ($ENV{'form.usymb'}) {
+           $r->print('<br><b>Assessment:</b> <tt>'.$ENV{'form.usymb'}.'</tt>');
+        }
     }
 
 # ---------------------------------------------------------------- Course title
@@ -2183,8 +2215,21 @@ ENDSCRIPT
     } else {
         $r->print('<br>Show empty rows: ');
     } 
-    $r->print('<input type=checkbox name=showall onClick="submit()"');
-    if ($ENV{'form.showall'}) { $r->print(' checked'); }
+
+    $r->print(&hiddenfield('userselhidden','true').
+             '<input type=checkbox name=showall onClick="submit()"');
+
+    if ($ENV{'form.showall'}) { 
+       $r->print(' checked'); 
+    } else {
+	unless ($ENV{'form.userselhidden'}) {
+           unless 
+	($ENV{'course.'.$ENV{'request.course.id'}.'.hideemptyrows'} eq 'yes') {
+          $r->print(' checked');
+          $ENV{'form.showall'}=1;
+           }
+       }
+    }
     $r->print('>');
     if (&gettype($asheet) eq 'classcalc') {
        $r->print(
@@ -2210,3 +2255,7 @@ ENDSCRIPT
 
 1;
 __END__
+
+
+
+