Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	27 Dec 2004 12:29:02 -0000	1.20
+++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	29 Dec 2004 10:19:07 -0000	1.21
@@ -3,6 +3,7 @@
 
   <msg key="above">Above</msg>
   <msg key="Absolute_Size">Absolute Size</msg>
+  <msg key="Absolute_Size_help">Number of characters a user can enter in the text field for his answer.</msg>
   <msg key="add_item">Add new question</msg>
   <msg key="add_item_display_cb">Add new question: Checkbox Display</msg>
   <msg key="add_item_display_rb">Add new question: Radiobutton Display</msg>
@@ -84,6 +85,8 @@
   <msg key="Choice_help">Description of the choice</msg>
   <msg key="Choice_Orientation">Choice Orientation</msg>
   <msg key="Choice_Orientation_help">Which orientation shall the choices have</msg>
+  <msg key="choice_set">Title</msg>
+  <msg key="choice_set_title">Title</msg>
   <msg key="Consent_Page">Consent Page</msg>
   <msg key="continue_with_copy">Continue with Copy</msg>
   <msg key="continue_with_insert">Continue with Insert</msg>
@@ -146,9 +149,10 @@
   <msg key="Feedback_right">Feedback right</msg>
   <msg key="Feedback_right_help">Feedback given to the user if he correctly answered this question.</msg>
   <msg key="Feedback_wrong">Feedback wrong</msg>
-  <msg key="Feedback_wrong_help">Feedback given to the user if the feedback was wrong.</msg>
+  <msg key="Feedback_wrong_help">Feedback given to the user if his answer was wrong</msg>
   <msg key="Field_Code">Field Code</msg>
-  <msg key="Field_Code_help">A short label for use in data output header rows, etc</msg>
+  <msg key="Field_Code_help">A short label used when exporting question (e.g. for column or row names in a spreadsheet)
+</msg>
   <msg key="Finish_Time">Finish Time</msg>
   <msg key="Finished">Finished</msg>
   <msg key="from">From:</msg>
@@ -163,7 +167,7 @@
 Increasing (false) will either give 100%, if all correct answers are given, or 0% else. </msg>
   <msg key="Instructions">Instructions</msg>
   <msg key="item_Definition_help">REDUNDANT, Description should be enough</msg>
-  <msg key="item_Description_help">Additional description of the question</msg>
+  <msg key="item_Description_help">Additional searchable description for the question catalog</msg>
   <msg key="item_display_cb">Checkboxes</msg>
   <msg key="item_display_rb">Radiobuttons</msg>
   <msg key="item_display_sa">Short Answer</msg>
@@ -174,6 +178,7 @@
   <msg key="item_Required_help">Does this item have to be answered (when displayed)?</msg>
   <msg key="item_Subtext_help">A secondary label, needed for many kinds of questions</msg>
   <msg key="item_time_help">Seconds allowed for completing this question</msg>
+  <msg key="item_Title">Question</msg>
   <msg key="item_Title_help">The question itself</msg>
   <msg key="Item_Type">Question Type</msg>
   <msg key="item_type_dq">Database Question</msg>
@@ -205,7 +210,7 @@
   <msg key="make_show_item_name">Show item name</msg>
   <msg key="make_unsecure">Allow unsecure connection</msg>
   <msg key="max_time">max. time allowed:</msg>
-  <msg key="mc_Title_help">A name for this set of choices for reusability</msg>
+  <msg key="mc_Title_help">A name for this set of choices (for reusability)</msg>
   <msg key="Minutes_for_Retry">Minutes required for Retry</msg>
   <msg key="Mode">Mode</msg>
   <msg key="Move_Down">Move Down</msg>
@@ -240,7 +245,7 @@
   <msg key="Percent_Score_help">Percentage of the points of  the question this choice gives. May be larger than 100 and lower than -100.</msg>
   <msg key="points">points</msg>
   <msg key="points_item">Points for Question</msg>
-  <msg key="points_item_help">How many points in the whole assessment is this section worth.</msg>
+  <msg key="points_item_help">How many points is this question worth in a section. This is a measurement for relative difficulty.</msg>
   <msg key="points_section">Points for Section</msg>
   <msg key="Preview">Preview</msg>
   <msg key="Question">Question</msg>
@@ -265,6 +270,7 @@
   <msg key="Review_Asessment">Review Assessment</msg>
   <msg key="right">Right</msg>
   <msg key="Rulebased_branching">Rule-based Branching</msg>
+  <msg key="sa_Title_help">A title for this short answer feature set so it can be reused in the future.</msg>
   <msg key="Score">Score</msg>
   <msg key="Search">Search</msg>
   <msg key="Search_Item">Search and add questions</msg>
Index: openacs-4/packages/assessment/lib/item-show-mc.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-mc.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/item-show-mc.xql	10 Dec 2004 11:42:22 -0000	1.2
+++ openacs-4/packages/assessment/lib/item-show-mc.xql	29 Dec 2004 10:19:07 -0000	1.3
@@ -5,13 +5,14 @@
 <querytext>
 
     select c.title, t.increasing_p, t.allow_negative_p, t.num_correct_answers, t.num_answers,
-           t.as_item_type_id
+           max(t.as_item_type_id) as as_item_type_id
     from as_item_type_mc t, cr_revisions c, as_item_rels r
     where t.as_item_type_id = r.target_rev_id
     and r.item_rev_id = :as_item_id
     and r.rel_type = 'as_item_type_rel'
     and c.revision_id = t.as_item_type_id
-
+    group by c.title, t.increasing_p, t.allow_negative_p,
+           t.num_correct_answers, t.num_answers
 </querytext>
 </fullquery>
 
Index: openacs-4/packages/assessment/tcl/as-item-form-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-form-procs.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/tcl/as-item-form-procs.xql	10 Dec 2004 20:21:50 -0000	1.4
+++ openacs-4/packages/assessment/tcl/as-item-form-procs.xql	29 Dec 2004 10:19:07 -0000	1.5
@@ -4,7 +4,7 @@
 <fullquery name="as::item_form::add_item_to_form.item_properties">
 	<querytext>
 		select cr.title, i.subtext, i.data_type, i.required_p,
-		       oi.object_id as item_type_id, oi.object_type as item_type,
+		       max(oi.object_id) as item_type_id, oi.object_type as item_type,
 		       od.object_id as display_type_id, od.object_type as display_type
 		from as_items i, cr_revisions cr, as_item_rels it,
 		     as_item_rels dt, acs_objects oi, acs_objects od
@@ -16,6 +16,7 @@
 		and dt.rel_type = 'as_item_display_rel'
 		and oi.object_id = it.target_rev_id
 		and od.object_id = dt.target_rev_id
+		group by cr.title, i.subtext, i.data_type, i.required_p, oi.object_type,od.object_id, od.object_type
 	</querytext>
 </fullquery>
 
Index: openacs-4/packages/assessment/www/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/www/index.xql	22 Dec 2004 20:52:17 -0000	1.4
+++ openacs-4/packages/assessment/www/index.xql	29 Dec 2004 10:19:07 -0000	1.5
@@ -7,6 +7,8 @@
 			from as_assessments a, cr_revisions cr, cr_items ci
 			where a.assessment_id = cr.revision_id
 			and cr.revision_id = ci.latest_revision
+			and exists (select 1 from as_assessment_section_map asm
+		where asm.assessment_id = a.assessment_id)
 		</querytext>
 	</fullquery>
 	
Index: openacs-4/packages/assessment/www/admin/item-add-mc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-mc.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/www/admin/item-add-mc.tcl	29 Dec 2004 09:07:39 -0000	1.4
+++ openacs-4/packages/assessment/www/admin/item-add-mc.tcl	29 Dec 2004 10:19:08 -0000	1.5
@@ -40,7 +40,7 @@
 
 ad_form -name item_add_mc -action item-add-mc -export { assessment_id section_id after num_choices } -form {
     {as_item_id:key}
-    {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.mc_Title_help]"}}
+    {title:text {label "[_ assessment.choice_set_title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.mc_Title_help]"}}
     {increasing_p:text(select) {label "[_ assessment.Increasing]"} {options $boolean_options}  {help_text "[_ assessment.Increasing_help]"}}
     {negative_p:text(select) {label "[_ assessment.Allow_Negative]"} {options $boolean_options} {help_text "[_ assessment.Allow_Negative_help]"}}
     {num_correct_answers:text,optional {label "[_ assessment.num_Correct_Answer]"} {html {size 5 maxlength 5}} {help_text "[_ assessment.num_Correct_help]"}}
Index: openacs-4/packages/assessment/www/admin/item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/assessment/www/admin/item-add.tcl	29 Dec 2004 09:07:39 -0000	1.6
+++ openacs-4/packages/assessment/www/admin/item-add.tcl	29 Dec 2004 10:19:08 -0000	1.7
@@ -42,8 +42,8 @@
 ad_form -name item_add -action item-add -export { assessment_id section_id after } -form {
     {as_item_id:key}
     {name:text,optional {label "[_ assessment.Name]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.item_Name_help]"}}
-    {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.item_Title_help]"}}
-    {description:text(textarea) {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.item_Description_help]"}}
+    {title:text(textarea) {label "[_ assessment.item_Title]"} {html {rows 3 cols 80 maxlength 1000}} {help_text "[_ assessment.item_Title_help]"}}
+    {description:text(textarea),optional {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.item_Description_help]"}}
 }
 
 if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
Index: openacs-4/packages/assessment/www/admin/item-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/admin/item-edit.xql	10 Dec 2004 11:42:23 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/item-edit.xql	29 Dec 2004 10:19:08 -0000	1.3
@@ -17,7 +17,7 @@
 <fullquery name="item_type">
       <querytext>
 
-    select o.object_type
+    select max(o.object_type)
     from acs_objects o, as_item_rels r
     where r.item_rev_id = :as_item_id
     and r.rel_type = 'as_item_type_rel'
Index: openacs-4/packages/assessment/www/admin/one-a.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/one-a.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/assessment/www/admin/one-a.adp	29 Dec 2004 09:07:39 -0000	1.6
+++ openacs-4/packages/assessment/www/admin/one-a.adp	29 Dec 2004 10:19:08 -0000	1.7
@@ -55,7 +55,7 @@
 
 <tr class="odd">
 	<td><if @assessment_data.number_tries@ not nil> #assessment.limited_tries#</if><else>#assessment.unlimited_tries#</else> -
-	[ <a href="assesment-form?assessment_id=@assessment_id@">#assessment.Edit#</a> ]</td>
+	[ <a href="assessment-form?assessment_id=@assessment_id@">#assessment.Edit#</a> ]</td>
 </tr>
 
 <tr class="odd">