Index: openacs-4/packages/assessment/assessment.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/assessment/assessment.info	26 Nov 2004 20:51:24 -0000	1.7
+++ openacs-4/packages/assessment/assessment.info	5 Dec 2004 17:18:01 -0000	1.8
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="0.01d" url="http://openacs.org/repository/download/apm/assessment-0.01d.apm">
+    <version name="0.02d" url="http://openacs.org/repository/download/apm/assessment-0.02d.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
@@ -20,10 +20,11 @@
 	<maturity>0</maturity>
         <vendor url="http://www.e-lane.org/">E-LANE</vendor>
         <description format="text/plain">Create assessments and evalueate.</description>
-        <provides url="assessment" version="0.01d"/>
+        <provides url="assessment" version="0.02d"/>
         <requires url="acs-kernel" version="5.0d13"/>
         <requires url="acs-templating" version="4.1.2"/>
         <requires url="acs-content-repository" version="5.2.0d8"/>
+        <requires url="categories" version="1.1d2"/>
 	
 	 <callbacks>
             <callback type="after-install"  proc="as::install::assessment_create_install"/>
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.8 -r1.9
--- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	3 Dec 2004 10:25:34 -0000	1.8
+++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	5 Dec 2004 17:17:12 -0000	1.9
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="assessment" package_version="0.01d" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="above">Above</msg>
+  <msg key="Absolute_Size">Absolute Size</msg>
   <msg key="Add_Existing">Add existing question</msg>
   <msg key="Add_Existing_1">Add existing question to section &quot;%section_title%&quot;</msg>
   <msg key="add_existing_section">Add existing section</msg>
@@ -11,28 +13,51 @@
   <msg key="Add_to_assessment">Add to assessment &quot;%assessment_data.title%&quot;</msg>
   <msg key="Add_to_section">Add to section &quot;%section_title%&quot;</msg>
   <msg key="Admin_catalog">Question Catalog Administration</msg>
+  <msg key="admin_categories">Categories Administration</msg>
   <msg key="Administration">Administration</msg>
   <msg key="All">All</msg>
   <msg key="allow_multiple">allow multiple</msg>
+  <msg key="Allow_Negative">Allow Negative</msg>
   <msg key="allow_tries">allow %assessment_data.number_tries%</msg>
+  <msg key="alphabetical">Alphabetical</msg>
   <msg key="Anonymous_Responses">Anonymous Responses</msg>
   <msg key="anonymous_users_allow">Anonymous respondents allowed</msg>
+  <msg key="Answer_Alignment">Answer Alignment</msg>
   <msg key="Answer_Choices">Answer Choices</msg>
   <msg key="Assessment">Assessment</msg>
   <msg key="Assessment_Administration">Assessment Administration</msg>
   <msg key="Assessment_Imported_Correctly">Assessment Imported Correctly</msg>
   <msg key="Assessment_Title">Title</msg>
   <msg key="Attempt">Attempt</msg>
+  <msg key="below">Below</msg>
+  <msg key="besideleft">Beside-Left</msg>
+  <msg key="besideright">Beside-Right</msg>
+  <msg key="bottom">Bottom</msg>
+  <msg key="Box_Orientation">Box Orientation</msg>
   <msg key="By_user">By user</msg>
   <msg key="cancel_and_return">Cancel and Return to Assessment</msg>
+  <msg key="Choice">Choice</msg>
+  <msg key="Choice_Orientation">Choice Orientation</msg>
   <msg key="Consent_Page">Consent Page</msg>
   <msg key="continue_with_remove">Continue with Remove</msg>
   <msg key="Copy">Copy</msg>
   <msg key="Copy_this_assess">Copy this assessment</msg>
-  <msg key="Correct_Answer">Correct Answer</msg>
+  <msg key="Correct_Answer_Choice">Correct Answer Choice</msg>
   <msg key="Created_by">- Created by</msg>
   <msg key="CSV_file">CSV file</msg>
+  <msg key="Data_Type">Data Type</msg>
+  <msg key="data_type_boolean">Boolean</msg>
+  <msg key="data_type_content_type">File</msg>
+  <msg key="data_type_date">Date</msg>
+  <msg key="data_type_exponential">Exponential</msg>
+  <msg key="data_type_integer">Integer</msg>
+  <msg key="data_type_numeric">Numerical</msg>
+  <msg key="data_type_text">Text</msg>
+  <msg key="data_type_timestamp">Time</msg>
+  <msg key="data_type_varchar">Short Text</msg>
   <msg key="Default_Path">Default Path</msg>
+  <msg key="Default_Selected">Default: Selected</msg>
+  <msg key="Default_Value">Default Value</msg>
   <msg key="Definition">Definition</msg>
   <msg key="Delete">Delete</msg>
   <msg key="Delete_this_assess">Delete this assessment</msg>
@@ -51,14 +76,34 @@
   <msg key="Export">Export</msg>
   <msg key="Extreme_Actions">Extreme Actions:</msg>
   <msg key="Feedback">Feedback</msg>
+  <msg key="Feedback_right">Feedback right</msg>
+  <msg key="Feedback_wrong">Feedback wrong</msg>
+  <msg key="Field_Code">Field Code</msg>
   <msg key="Finish_Time">Finish Time</msg>
   <msg key="Finished">Finished</msg>
   <msg key="from">From:</msg>
   <msg key="hide_item_name">Question name hidden</msg>
+  <msg key="horizontal">Horizontal</msg>
+  <msg key="Html_Options">HTML Options</msg>
   <msg key="Import_QTI_ZIP_File">Import QTI ZIP File</msg>
   <msg key="Import_Results">Import Results</msg>
   <msg key="Instructions">Instructions</msg>
+  <msg key="Increasing">Increasing</msg>
+  <msg key="item_display_cb">Checkboxes</msg>
+  <msg key="item_display_rb">Radiobuttons</msg>
+  <msg key="item_display_sa">Selectbox</msg>
+  <msg key="item_display_ta">Textarea</msg>
+  <msg key="item_display_tb">Textbox</msg>
+  <msg key="Item_Type">Item Type</msg>
+  <msg key="item_type_dq">Database Question</msg>
+  <msg key="item_type_file">File</msg>
+  <msg key="item_type_mc">Multiple Choice</msg>
+  <msg key="item_type_oq">Open Question</msg>
+  <msg key="item_type_sa">Short Answer</msg>
+  <msg key="Instructions">Instructions</msg>
   <msg key="Items">Items</msg>
+  <msg key="Label_Orientation">Label Orientation</msg>
+  <msg key="left">Left</msg>
   <msg key="Lets_you_use_this_a">- Lets you use this assessment as a template to create a new assessment.</msg>
   <msg key="limited_tries">Only %assessment_data.number_tries% tries allowed</msg>
   <msg key="make_anonymous">Make anonymous</msg>
@@ -82,18 +127,25 @@
   <msg key="no">No</msg>
   <msg key="no_waiting">Immediate retry allowed</msg>
   <msg key="None">None</msg>
+  <msg key="num_Answers">Total Number of displayed Choices</msg>
+  <msg key="num_Correct_Answer">Number of displayed Correct Choices</msg>
   <msg key="Number_of_Tries">Number of Tries allowed</msg>
+  <msg key="numerical">Numerical</msg>
   <msg key="on_creation_date">, on %creation_date%</msg>
   <msg key="One_Assessment_data">One Assessment: %assessment_data.title%</msg>
   <msg key="Only_correct">Only correct Responses</msg>
   <msg key="Only_incorrect">Only incorrect Responses</msg>
+  <msg key="order_of_entry">Order of Entry</msg>
+  <msg key="Order_Type">Order Type</msg>
   <msg key="Out_of">Out of</msg>
+  <msg key="Percent_Score">Percent Score</msg>
   <msg key="points">points</msg>
   <msg key="Preview">Preview</msg>
   <msg key="Question">Question</msg>
   <msg key="Question_not_answered">Question not answered</msg>
   <msg key="Questions">Questions</msg>
   <msg key="Randomized">Randomized</msg>
+  <msg key="randomized">Randomized</msg>
   <msg key="reg_users_required">Registrated respondents required</msg>
   <msg key="regarding_this_assess">regarding this survey</msg>
   <msg key="remove_1">Remove:</msg>
@@ -108,6 +160,7 @@
   <msg key="reuse_responses">Old responses displayed</msg>
   <msg key="Reuse_Responses_1">Reuse Responses</msg>
   <msg key="Review_Asessment">Review Assessment</msg>
+  <msg key="right">Right</msg>
   <msg key="Rulebased_branching">Rule-based Branching</msg>
   <msg key="Score">Score</msg>
   <msg key="section">SECTION</msg>
@@ -129,13 +182,15 @@
   <msg key="Subject">Subject</msg>
   <msg key="Subject_Name">Subject Name</msg>
   <msg key="Submit">Submit</msg>
+  <msg key="Subtext">Subtext</msg>
   <msg key="Summary">Summary</msg>
   <msg key="This_question_will_be_corrected_by_the_teacher">This question will be corrected by the teacher</msg>
   <msg key="time_for_completion">Seconds allowed for completion</msg>
   <msg key="time_response">%assessment_data.time_for_response% seconds maximum response time</msg>
   <msg key="Time_spent">Time spent</msg>
   <msg key="time_to_wait">Retry allowed after %assessment_data.wait_between_tries% minutes</msg>
   <msg key="Title">Title</msg>
+  <msg key="top">Top</msg>
   <msg key="Total_score">Total score</msg>
   <msg key="unlimited_time">Unlimited time for response</msg>
   <msg key="unlimited_tries">Unlimited number of tries allowed</msg>
@@ -144,6 +199,7 @@
   <msg key="User_ID">User ID</msg>
   <msg key="Users_may_edit_their_">Users may edit their responses</msg>
   <msg key="Users_may_not_edit_th">Users may not edit their responses</msg>
+  <msg key="vertical">Vertical</msg>
   <msg key="View_Responses">View Responses:</msg>
   <msg key="View_Results">View Results</msg>
   <msg key="View_results">View results</msg>
Index: openacs-4/packages/assessment/lib/section-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/section-items.adp	15 Nov 2004 12:06:52 -0000	1.2
+++ openacs-4/packages/assessment/lib/section-items.adp	5 Dec 2004 17:17:11 -0000	1.3
@@ -5,7 +5,7 @@
 <if @items:rowcount@ eq 0>
   <tr class="odd">
   <td></td><td>
-    <a href="item-form?section_id=@section_id@&assessment_id=@assessment_id@&after=0">#assessment.Add_New#</a>
+    <a href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=0">#assessment.Add_New#</a>
     <a href="item-add-existing?section_id=@section_id@&assessment_id=@assessment_id@&after=0">#assessment.Add_Existing#</a>
   </td></tr>
 </if>
@@ -21,13 +21,13 @@
 
 <td valign="top">@items.rownum@.<if @items.required_p@ eq t> <font color=red>*</font> </if></td>
 
-<td><a href="item-form?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a>
+<td><a href="item-edit?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a>
 
 <if @items.enabled_p@ eq "f"><span style="color: #f00;">#assessment.disabled#</span></if>
 
 <a href="item-copy?as_item_id=@items.as_item_id@&sort_order=@items.sort_order@">#assessment.Copy#</a>
 
-<a href="item-form?section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.Add_New#</a>
+<a href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.Add_New#</a>
 
 <a href="item-add-existing?section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.Add_Existing#</a><img src="../graphics/spacer.gif" border="0" alt="" width="10">
 
@@ -73,7 +73,7 @@
     <tr class="odd">
   </else>
   <td></td><td>
-    <a href="item-form?section_id=@section_id@&assessment_id=@assessment_id@&after=@items:rowcount@">#assessment.Add_New#</a>
+    <a href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=@items:rowcount@">#assessment.Add_New#</a>
     <a href="item-add-existing?section_id=@section_id@&assessment_id=@assessment_id@&after=@items:rowcount@">#assessment.Add_Existing#</a>
   </td></tr>
 </if>
Index: openacs-4/packages/assessment/tcl/as-assessment-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-assessment-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/tcl/as-assessment-procs.tcl	26 Nov 2004 20:48:37 -0000	1.6
+++ openacs-4/packages/assessment/tcl/as-assessment-procs.tcl	5 Dec 2004 17:17:12 -0000	1.7
@@ -129,7 +129,7 @@
 	copy_sections -assessment_id $assessment_rev_id -new_assessment_id $new_rev_id
     }
 
-    return $assessment_rev_id
+    return $new_rev_id
 }
 
 ad_proc -public as::assessment::data {
Index: openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl	22 Nov 2004 11:59:22 -0000	1.3
+++ openacs-4/packages/assessment/tcl/as-item-choice-procs.tcl	5 Dec 2004 17:17:12 -0000	1.4
@@ -12,10 +12,10 @@
     {-data_type ""}
     {-numeric_value ""}
     {-text_value ""}
-    {-boolean_value:boolean ""}
+    {-boolean_value ""}
     {-content_value ""}
     {-feedback_text ""}
-    {-selected_p:boolean ""}
+    {-selected_p ""}
     {-correct_answer_p ""}
     {-sort_order ""}
     {-percent_score ""}
Index: openacs-4/packages/assessment/tcl/as-item-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-form-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/tcl/as-item-form-procs.tcl	2 Dec 2004 11:08:40 -0000	1.6
+++ openacs-4/packages/assessment/tcl/as-item-form-procs.tcl	5 Dec 2004 17:17:12 -0000	1.7
@@ -35,13 +35,13 @@
 	}
 
 	"textarea" {
-	    db_0or1row html_rows_cols "SELECT abs_size FROM as_item_display_tax WHERE item_id=:item_display_id"	   
+	    db_0or1row html_rows_cols "SELECT html_display_options FROM as_item_display_tax WHERE item_id=:item_display_id"	   
 	    template::element::create $form $element_name \
 		-datatype text \
 		-widget textarea \
 		-label $title \
 		-value $user_value \
-		-html $abs_size \
+		-html $html_display_options \
 		-nospell \
 		-required_p $required_p
 	}
@@ -50,7 +50,8 @@
 	    set widget "text(radio)"
 	    set item_item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:item_id"]
 	    set item_mc_id [db_string item_item_type "SELECT related_object_id FROM cr_item_rels WHERE relation_tag = 'as_item_type_rel' AND item_id=:item_item_id"]
-	    set mc_id [db_string item_to_rev "SELECT revision_id FROM cr_revisions WHERE item_id=:item_mc_id"]
+	    set mc_id [db_string item_to_rev "SELECT latest_revision FROM cr_items WHERE item_id=:item_mc_id"]
+	    ## set mc_id [db_string item_to_rev "SELECT revision_id FROM cr_revisions WHERE item_id=:item_mc_id"]
 	    set optionlist [list]
 	    db_foreach item_choices_2 "" {
 	        #for multiple choice item with multimedia
@@ -75,7 +76,8 @@
 	"checkbox" {
 	    set item_item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:item_id"]
 	    set item_mc_id [db_string item_item_type "SELECT related_object_id FROM cr_item_rels WHERE relation_tag = 'as_item_type_rel' AND item_id=:item_item_id"]
-	    set mc_id [db_string item_to_rev "SELECT revision_id FROM cr_revisions WHERE item_id=:item_mc_id"]
+	    set mc_id [db_string item_to_rev "SELECT latest_revision FROM cr_items WHERE item_id=:item_mc_id"]
+	    ## set mc_id [db_string item_to_rev "SELECT revision_id FROM cr_revisions WHERE item_id=:item_mc_id"]
 	    set choices [list]
 	    set optionlist [list]
 	    db_foreach item_choices_2 "" {