Index: openacs-4/packages/assessment/www/assessment-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/Attic/assessment-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/assessment-postgresql.xql	7 Oct 2004 13:29:36 -0000	1.3
+++ openacs-4/packages/assessment/www/assessment-postgresql.xql	3 Nov 2004 14:51:52 -0000	1.4
@@ -4,13 +4,13 @@
 
 	<fullquery name="query_all_items">
 		<querytext>
-			SELECT i.as_item_id, i.name, i.title
+			SELECT i.as_item_id, i.name, i.title, s.section_id as section_id, s.title as section_title, s.description as section_description
 			FROM as_sectionsx s INNER JOIN as_assessment_section_map asm USING (section_id)
 			INNER JOIN as_assessmentsx a USING (assessment_id)
 			INNER JOIN as_item_section_map ism ON s.section_id = ism.section_id
 			INNER JOIN as_itemsx i USING (as_item_id)
 			WHERE a.assessment_id = :assessment_id
-			ORDER BY ism.sort_order
+			ORDER BY s.section_id, ism.sort_order
 		</querytext>
 	</fullquery>
 
Index: openacs-4/packages/assessment/www/assessment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/assessment/www/assessment.adp	7 Oct 2004 10:58:07 -0000	1.7
+++ openacs-4/packages/assessment/www/assessment.adp	3 Nov 2004 14:51:52 -0000	1.8
@@ -12,10 +12,17 @@
 
 <formtemplate id="show_item_form">
     <input type="hidden" name="as_session_id" value="@as_session_id@">
+    <multiple name="items">
+        <table border="0">
+	   <tr bgcolor="#d0d0d0"><td><b>SECCI�N: @items.section_title@ </b></td></tr>
+	   <tr><td><i> @items.section_description@ </i><br></td></tr>
+	</table>
+
+	<br>&nbsp;&nbsp;
+	<b>#assessment.Items#</b><br><br>
 	<table border="0">
-		<br>&nbsp;&nbsp;
-		<b>#assessment.Items#</b><br><br>
-		<multiple name="items">
+
+		     <group column="section_title">
 			<tr>
 				<tr bgcolor="#e4eaef"><td colspan="2" nowrap><b>#assessment.Question# @items.rownum@:</b></td><td><b><if @items.presentation_type@ not in fitb>@items.title@</if></b></td></tr>
 				<tr><td colspan="4">
@@ -37,8 +44,10 @@
 					<hr>
 				</td>
 			</tr>
-		</multiple>
+		     </group>
+
 	</table>
+    </multiple>
 <table align="center"><tr><td><input type=submit value="#assessment.Submit#"></td></tr></table>
 </formtemplate>
 
Index: openacs-4/packages/assessment/www/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/assessment/www/session.adp	14 Oct 2004 14:15:04 -0000	1.9
+++ openacs-4/packages/assessment/www/session.adp	3 Nov 2004 14:51:52 -0000	1.10
@@ -17,9 +17,15 @@
 </tr>
 </table>
 
-<table cellpadding="3" cellspacing="0" border="0" width="100%">
+<multiple name="items">
+    <table border="0">
+        <tr bgcolor="#d0d0d0"><td><b> @items.section_title@ </b></td></tr>
+	<tr><td><i> @items.section_description@ </i><br></td></tr>
+    </table>
+
+    <table cellpadding="3" cellspacing="0" border="0" width="100%">
 	<table border="0">
-		<multiple name="items">
+		<group column="section_id">
 			<tr bgcolor="#e4eaef"><td colspan="2"><b>#assessment.Question# @items.rownum@</b>&nbsp;&nbsp;(@items.maxscore@ #assessment.points#)</td></tr>
 			<tr><td colspan="2">
 			<b><if @items.presentation_type@ not in fitb>@items.title@</if></b>
@@ -38,9 +44,10 @@
 			<tr><td></td><td><b>#assessment.Feedback#:</b> <if @items.item_correct@>@items.feedback_right@</if><if @items.item_correct@ false>@items.feedback_wrong@</if></td></tr>
 			<tr><td><br></td></tr>
 			</else>
-		</multiple>
+		</group>
 	</table>
-</table>
+    </table>
+</multiple>
 <hr>
 <b>#assessment.Total_score#:</b> @session_score@ / @assessment_score@
 </master>
Index: openacs-4/packages/assessment/www/session.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/assessment/www/session.xql	27 Oct 2004 13:51:10 -0000	1.9
+++ openacs-4/packages/assessment/www/session.xql	3 Nov 2004 14:51:52 -0000	1.10
@@ -4,11 +4,11 @@
 
 	<fullquery name="query_all_items">
 		<querytext>
-			SELECT as_itemsx.as_item_id, as_itemsx.name, as_itemsx.title, as_itemsx.feedback_right, as_itemsx.feedback_wrong
+			SELECT as_itemsx.as_item_id, as_itemsx.name, as_itemsx.title, as_itemsx.feedback_right, as_itemsx.feedback_wrong, as_sectionsx.section_id, as_sectionsx.title as section_title, as_sectionsx.description as section_description
 			FROM ((as_sectionsx INNER JOIN (as_assessmentsx INNER JOIN as_assessment_section_map ON as_assessmentsx.assessment_id=as_assessment_section_map.assessment_id) ON
 			as_sectionsx.section_id=as_assessment_section_map.section_id) INNER JOIN (as_itemsx INNER JOIN as_item_section_map ON as_itemsx.as_item_id=as_item_section_map.as_item_id) ON as_sectionsx.section_id=as_item_section_map.section_id) INNER JOIN as_sessionsx ON as_assessmentsx.assessment_id = as_sessionsx.assessment_id
 			WHERE as_sessionsx.session_id = :session_id
-			ORDER BY as_item_section_map.sort_order
+			ORDER BY as_sectionsx.section_id, as_item_section_map.sort_order
 		</querytext>
 	</fullquery>