--- loncom/interface/spreadsheet/default_assesscalc	2002/12/13 16:36:34	1.6
+++ loncom/interface/spreadsheet/default_assesscalc	2003/08/01 13:47:26	1.7
@@ -1,12 +1,14 @@
 <field col=A row=0>
-if ([stores_0_solved] eq 'excused') {
+if ("[stores_0_solved]" eq 'excused') {
     'excused';
 } elsif (M0) { 
     if(K0) {
         if (K0 == M0) {
             "correct";
-        } else {
+        } elsif (K0 < M0) {
             K0.'/'.M0.' correct';
+        } else {
+            'correct';
         }
     } else {
         "incorrect";
@@ -50,23 +52,25 @@ if ([parameter_0_duedate]>100000000) {
 </field>
 
 <field col=J row=0>'Attempted Parts:'</field>
-<field col=K row=0>[&EXPANDSUM(PART;(stores_PART_solved?1:0))]</field>
+<field col=K row=0>
+[&EXPANDSUM(PART;(stores_PART_solved !~ /^(\W?excused\W?|)$/ ?1:0))]
+</field>
 
 <field col=L row=0>'Solved Parts:'</field>
 <field col=M row=0>[&EXPANDSUM(PART;(stores_PART_awarded?1:0))]</field>
 
 <field col=W row=0>'Available Points:'</field>
 <field col=X row=0>
-if (([stores_0_solved]) eq 'excused') { 
+if ("[stores_0_solved]" eq 'excused') {
     0 
 } else { 
-    [&EXPANDSUM(PART;parameter_PART_weight)];
+    [&EXPANDSUM(PART;parameter_PART_weight*(stores_PART_solved !~ /^\W?excused\W?$/ ? 1 : 0))];
 }
 </field>
 
 <field col=Y row=0>'Awarded Points:'</field>
 <field col=Z row=0>
-if (([stores_0_solved]) eq 'excused') { 
+if ("[stores_0_solved]" eq 'excused') { 
     0 
 } else { 
     [&EXPANDSUM(PART;parameter_PART_weight*stores_PART_awarded)]