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 -r1.75 -r1.76
--- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	12 Jun 2006 18:59:20 -0000	1.75
+++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	26 Sep 2006 02:22:57 -0000	1.76
@@ -15,6 +15,7 @@
   <msg key="action_tcl_code">Tcl_code</msg>
   <msg key="action_that_will">The action that will be executed.</msg>
   <msg key="action_to_perform">Action to Perform</msg>
+  <msg key="Add_Comment">Add Comment</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_f">Item Display</msg>
@@ -162,6 +163,7 @@
   <msg key="Choice_Sets">Existing Choice Set</msg>
   <msg key="choose_action">Choose the action to perform</msg>
   <msg key="choose_type">What kind of assessment you want to create?</msg>
+  <msg key="Closed_Assessments">Closed Assessments</msg>
   <msg key="comparator">Comparator</msg>
   <msg key="comparator_not_set_error">You must set a Comparator for this Comparison Type</msg>
   <msg key="comparison_type">Comparison Type</msg>
@@ -419,6 +421,7 @@
   <msg key="one_correct_choice_req">At least one correct choice required</msg>
   <msg key="Only_correct">Only correct Responses</msg>
   <msg key="Only_incorrect">Only incorrect Responses</msg>
+  <msg key="Open_Assessments">Open Assessments</msg>
   <msg key="open_assessments">Open Assessments</msg>
   <msg key="oq_Keywords">Keywords</msg>
   <msg key="oq_Keywords_help">Keywords used for automatic grading</msg>
@@ -483,14 +486,17 @@
   <msg key="Responding_Users">Responding Users</msg>
   <msg key="Response_Options">Response Options:</msg>
   <msg key="Response_Submitted">Response Submitted</msg>
+  <msg key="Results">Results</msg>
   <msg key="Results_by_user">Responses by user</msg>
-  <msg key="Results_change_display">(on %results.create_date% by &lt;a href=&amp;quot;%results.user_url%&amp;quot;&gt;%results.first_names% %results.last_name%&lt;/a&gt;)</msg>
+  <msg key="Results_change_display">(%results.creation_date% by &lt;a href=&amp;quot;%results.user_url%&amp;quot;&gt;%results.first_names% %results.last_name%&lt;/a&gt;)</msg>
   <msg key="Results_edit">Edit assessment result</msg>
-  <msg key="Results_edit_Description">Change explanation</msg>
+  <msg key="Results_edit_Description">Comment</msg>
+  <msg key="Results_edit_Description_help">Enter your comment for this question here</msg>
   <msg key="return">Return</msg>
   <msg key="Return_Url">Return URL</msg>
   <msg key="reuse_responses">Old responses displayed</msg>
   <msg key="Reuse_Responses_1">Reuse Responses</msg>
+  <msg key="Review">Review</msg>
   <msg key="Review_Asessment">Review Assessment</msg>
   <msg key="right">Right</msg>
   <msg key="Rulebased_branching">Rule-based Branching</msg>
Index: openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.20-0.21.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.20-0.21.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.20-0.21.sql	26 Sep 2006 00:22:45 -0000	1.3
+++ openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.20-0.21.sql	26 Sep 2006 02:22:58 -0000	1.4
@@ -13,6 +13,15 @@
 alter table as_assessments add type varchar2(1000);
 update as_assessments set type='survey' where type_int = 1;
 update as_assessments set type='test' where type_int = 2;
+
+drop view as_assessmentsx;
+drop view as_assessmentsi;
+
+begin
+content_type.refresh_view('as_assessments');
+end;
+/
+
 alter table as_assessments drop type_int;
 update acs_attributes set datatype='string' where attribute_name='type' and object_type='as_assessments';
 
Index: openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.20-0.21.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.20-0.21.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.20-0.21.sql	26 Sep 2006 00:22:45 -0000	1.3
+++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.20-0.21.sql	26 Sep 2006 02:22:58 -0000	1.4
@@ -13,6 +13,13 @@
 alter table as_assessments add type varchar(1000);
 update as_assessments set type='survey' where type_int = 1;
 update as_assessments set type='test' where type_int = 2;
+
+drop view as_assessmentsx;
+drop view as_assessmentsi;
+
 alter table as_assessments drop type_int;
+
+select content_type__refresh_view('as_assessments');
+
 update acs_attributes set datatype='string' where attribute_name='type' and object_type='as_assessments';
 
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl	3 Sep 2006 17:00:20 -0000	1.13
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl	26 Sep 2006 02:22:58 -0000	1.14
@@ -41,7 +41,7 @@
 ad_form -name item_edit_general -action item-edit-general -export { assessment_id section_id } -html {enctype multipart/form-data} -form {
     {as_item_id:key}
 }
-if { $type > 1} {
+if { $type ne "survey"} {
 	ad_form -extend -name item_edit_general -form {
 		 {description:text(textarea),optional {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.item_Description_help]"}}
 	}
@@ -56,7 +56,7 @@
 	}
 	}
 }
-if { $type > 1} { 
+if { $type ne "survey"} { 
 	ad_form -extend -name item_edit_general -form {
 	{content:file,optional {label "[_ assessment.item_Content]"} {help_text "[_ assessment.item_Content_help]"}}
 	}
@@ -66,7 +66,7 @@
     {question_text:richtext {label "[_ assessment.Question]"} {html {rows 3 cols 80 style {width:100%}}} {help_text "[_ assessment.item_Question_help]"}}
 }
 
-if { $type > 1} {
+if { $type ne "survey"} {
 	ad_form -extend -name item_edit_general -form {
 	{subtext:text,optional {label "[_ assessment.Subtext]"} {html {size 80 maxlength 500}} {help_text "[_ assessment.item_Subtext_help]"}}
 	{field_name:text,optional,nospell {label "[_ assessment.Field_Name]"} {html {size 80 maxlength 500}} {help_text "[_ assessment.Field_Name_help]"}}
@@ -77,7 +77,7 @@
 ad_form -extend -name item_edit_general -form {
     {required_p:text(select) {label "[_ assessment.Required]"} {options $boolean_options} {help_text "[_ assessment.item_Required_help]"}}
 }
-if { $type > 1} { 
+if { $type ne "survey"} { 
 ad_form -extend -name item_edit_general -form {
     {feedback_right:text(textarea),optional {label "[_ assessment.Feedback_right]"} {html {rows 5 cols 80}} {help_text "[_ assessment.Feedback_right_help]"}}
     {feedback_wrong:text(textarea),optional {label "[_ assessment.Feedback_wrong]"} {html {rows 5 cols 80}} {help_text "[_ assessment.Feedback_wrong_help]"}}