Index: openacs-4/packages/assessment/tcl/as-qti-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-qti-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/assessment/tcl/as-qti-procs.tcl	24 Dec 2004 15:32:38 -0000	1.15
+++ openacs-4/packages/assessment/tcl/as-qti-procs.tcl	28 Dec 2004 11:42:53 -0000	1.16
@@ -127,6 +127,7 @@
 	set as_items__title [$item getAttribute {title} {Item}]
 	array set as_item_choices__correct_answer_p {}
 	array set as_item_choices__score {}
+	set as_items__points 0
 	set as_items__feedback_right {}
 	set as_items__feedback_wrong {}
 	set as_items__description {}
@@ -166,6 +167,7 @@
 			set score [string trim [$scorenode nodeValue]]
 		    }
 		    set as_item_choices__score($choice) $score
+		    incr as_items__points $score
 		}
 		#<displayfeedback>
 		set displayfeedbackNodes [$respcondition selectNodes {displayfeedback}]
@@ -267,7 +269,7 @@
 		    }	
 		}
 		# Insert as_item
-		set as_item_id [as::item::new -title $as_items__title -feedback_right $as_items__feedback_right -feedback_wrong $as_items__feedback_wrong]
+		set as_item_id [as::item::new -title $as_items__title -feedback_right $as_items__feedback_right -feedback_wrong $as_items__feedback_wrong -points $as_items__points]
 		# set the relation between as_items and as_item_type tables
 		as::item_rels::new -item_rev_id $as_item_id -target_rev_id $as_item_type_id -type as_item_type_rel
 		# set the relation between as_items and as_item_display tables
@@ -323,6 +325,7 @@
 		    }
 		    # Insert as_item_choice
 		    set as_item_choices__correct_answer_p($as_item_choices__ident) [expr [info exists as_item_choices__correct_answer_p($as_item_choices__ident)]?{t}:{f}]
+		    set as_item_choices__score($as_item_choices__ident) [expr round(100 * $as_item_choices__score(as_item_choices__ident) / $as_items__points)]
 		    if {![info exists as_item_choices__score($as_item_choices__ident)]} {
 			set as_item_choices__score($as_item_choices__ident) 0
 		    }
Index: openacs-4/packages/assessment/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/assessment/www/index.adp	15 Nov 2004 12:08:27 -0000	1.9
+++ openacs-4/packages/assessment/www/index.adp	28 Dec 2004 11:42:53 -0000	1.10
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Assessment</property>
 <property name="context">@context;noquote@</property>
-<if @admin_p@ eq "1"><p style="text-align: right;"><a href="admin/"><img src="graphics/admin.gif" border="0" alt="Administer Assessments"></a></if>
+<if @admin_p@ eq "1"><p style="text-align: right;"><a href="admin/"><img src="graphics/admin.gif" border="0" alt="Administer Assessments"></a></p></if>
 
 <listtemplate name="assessments"></listtemplate>