--- loncom/interface/spreadsheet/assesscalc.pm	2003/05/27 20:20:25	1.10
+++ loncom/interface/spreadsheet/assesscalc.pm	2003/07/29 05:22:56	1.17
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.10 2003/05/27 20:20:25 matthew Exp $
+# $Id: assesscalc.pm,v 1.17 2003/07/29 05:22:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -123,6 +123,10 @@ sub clear_package {
     undef(%courseopt);
 }
 
+sub initialize {
+    &clear_package();
+}
+
 ########################################################
 ########################################################
 
@@ -136,10 +140,12 @@ sub clear_package {
 ########################################################
 sub initialize_package {
     my ($sname,$sdomain) = @_;
-    $current_course = $ENV{'request.course.id'};
     $current_name   = $sname;
     $current_domain = $sdomain;
-    undef(%courseopt);
+    if ($current_course ne $ENV{'request.course.id'}) {
+        $current_course = $ENV{'request.course.id'};
+        undef(%courseopt);
+    }
     &load_cached_export_rows();
     &load_parameter_caches();
 }
@@ -241,7 +247,7 @@ this user and course.
 ##################################################
 sub parmval {
     my $self = shift;
-    my ($what,$symb,$uname,$udom,$csec)=@_;
+    my ($what,$symb,$uname,$udom,$csec,$recurse)=@_;
     $uname = $self->{'name'}    if (! defined($uname));
     $udom  = $self->{'domain'}  if (! defined($udom));
     $csec  = $self->{'section'} if (! defined($csec));
@@ -306,9 +312,12 @@ sub parmval {
 	if ($part eq '') { $part='0'; }
 	my $newwhat=$rwhat;
 	$newwhat=~s/\Q$space\E/$part/;
-	my $partgeneral=$self->parmval($newwhat,$symb,$uname,$udom,$csec);
+	my $partgeneral=$self->parmval($newwhat,$symb,$uname,$udom,$csec,1);
 	if (defined($partgeneral)) { return $partgeneral; }
     }
+    if ($recurse) { return undef; }
+    my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$what);
+    if (defined($pack_def)) { return $pack_def; }
     #nothing defined
     return '';
 }
@@ -328,11 +337,11 @@ sub get_html_title {
 sub get_title {
     my $self = shift;
     my @title = ();
-    if (($self->{'usymb'} eq '_feedback') ||
-        ($self->{'usymb'} eq '_evaluation') ||
-        ($self->{'usymb'} eq '_discussion') ||
-        ($self->{'usymb'} eq '_tutoring')) {
-        my $assess_title = ucfirst($self->{'usymb'});
+    if (($self->{'symb'} eq '_feedback') ||
+        ($self->{'symb'} eq '_evaluation') ||
+        ($self->{'symb'} eq '_discussion') ||
+        ($self->{'symb'} eq '_tutoring')) {
+        my $assess_title = ucfirst($self->{'symb'});
         $assess_title =~ s/^_//;
         push(@title,$assess_title);
     } else {
@@ -365,13 +374,15 @@ sub outsheet_html {
     ###################################
     # Determine table structure
     ###################################
+    my $importcolor = '#FFFFFF';
+    my $exportcolor = '#FFFFAA';
     my $num_uneditable = 1;
     my $num_left = 52-$num_uneditable;
     my $tableheader =<<"END";
 <table border="2">
 <tr>
   <th colspan="2" rowspan="2"><font size="+2">Assessment</font></th>
-  <td bgcolor="#FFDDDD" colspan="$num_uneditable">&nbsp;</td>
+  <td bgcolor="$importcolor" colspan="$num_uneditable">&nbsp;</td>
   <td colspan="$num_left">
       <b><font size="+1">Calculations</font></b></td>
 </tr><tr>
@@ -379,7 +390,7 @@ END
     my $label_num = 0;
     foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
         if ($label_num<$num_uneditable) { 
-            $tableheader .= '<td bgcolor="#FFDDDD">';
+            $tableheader .= '<td bgcolor="'.$importcolor.'">';
         } else {
             $tableheader .= '<td>';
         }
@@ -392,11 +403,12 @@ END
     #
     # Print out template row
     $r->print('<tr><td>Template</td><td>&nbsp;</td>'.
-	      $self->html_template_row($num_uneditable)."</tr>\n");
+	      $self->html_template_row($num_uneditable,$importcolor).
+              "</tr>\n");
     #
     # Print out summary/export row
     $r->print('<tr><td>Export</td><td>0</td>'.
-	      $self->html_export_row()."</tr>\n");
+	      $self->html_export_row($exportcolor)."</tr>\n");
     #
     # Prepare to output rows
     $tableheader =<<"END";
@@ -405,7 +417,7 @@ END
 END
     foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
 	if ($label_num<$num_uneditable) { 
-            $tableheader.='<th bgcolor="#FFDDDD">';
+            $tableheader.='<th bgcolor="'.$importcolor.'">';
         } else {
             $tableheader.='<th>';
         }
@@ -418,7 +430,7 @@ END
 	    $r->print("</table>\n".$tableheader);
 	}
 	$r->print('<tr><td>'.$rownum.'</td>'.
-                  $self->assess_html_row($rownum)."</tr>\n");
+                  $self->assess_html_row($rownum,$importcolor)."</tr>\n");
     }
     $r->print("</table>\n");
     return;
@@ -426,7 +438,7 @@ END
 
 sub assess_html_row {
     my $self = shift();
-    my ($row) = @_;
+    my ($row,$importcolor) = @_;
     my $parameter_name = $self->{'formulas'}->{'A'.$row};
     my @rowdata = $self->get_row($row);
     my $num_cols_output = 0;
@@ -440,7 +452,7 @@ sub assess_html_row {
     }
     foreach my $cell (@rowdata) {
         if ($num_cols_output < 1) {
-            $row_html .= '<td bgcolor="#FFDDDD">';
+            $row_html .= '<td bgcolor="'.$importcolor.'">';
             $row_html .= &Apache::Spreadsheet::html_uneditable_cell($cell,
                                                                     '#FFDDDD');
         } else {
@@ -505,8 +517,21 @@ sub excel_rows {
 
 sub compute {
     my $self = shift;
-    $self->logthis('computing');
+#    $self->logthis('computing');
     $self->initialize_safe_space();
+    #########################################
+    #########################################
+    ###                                   ###
+    ###  Retrieve the problem parameters  ###
+    ###                                   ###
+    #########################################
+    #########################################
+    my @Mandatory_parameters = ("stores_0_solved",
+                                "stores_0_awarddetail",
+                                "stores_0_awarded",
+                                "timestamp",
+                                "stores_0_tries",
+                                "stores_0_award");
     #
     # Definitions
     undef(%nice_parameter_name);
@@ -515,7 +540,7 @@ sub compute {
     # Get the metadata fields and determine their proper names
     my ($symap,$syid,$srcf)=split(/___/,$self->{'symb'});
     my @Metadata = split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
-    foreach my $parm (@Metadata) {
+    foreach my $parm (@Mandatory_parameters,@Metadata) {
         next if ($parm !~ /^(resource\.|stores|parameter)_/);
         my $cleaned_name = $parm;
         $cleaned_name =~ s/^resource\./stores_/;
@@ -595,6 +620,7 @@ sub compute {
     #
     # Save the export data
     $self->save_export_data();
+    $self->save() if ($self->need_to_save());
     return;
 }