Index: openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.22d6-0.22d7.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.22d6-0.22d7.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.22d6-0.22d7.sql 2 Sep 2008 01:21:08 -0000 1.1 +++ openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-0.22d6-0.22d7.sql 7 Sep 2008 19:38:13 -0000 1.2 @@ -1,4 +1,14 @@ +alter table as_items rename column points to points_int; +alter table as_items add points float; +update as_items set points=points_int; +alter table as_items drop column points_int; +begin +content_type.refresh_view('as_item_data'); +end; +/ +show errors; + alter table as_item_data rename column points to points_int; alter table as_item_data add points float; update as_item_data set points=points_int; @@ -20,3 +30,26 @@ end; / show errors; + +alter table as_sections rename column points to points_int; +alter table as_sections add points float; +update as_sections set points=points_int; +alter table as_sections drop column points_int; + +begin +content_type.refresh_view('as_sections'); +end; +/ +show errors; + +alter table as_section_data rename column points to points_int; +alter table as_section_data add points float; +update as_section_data set points=points_int; +alter table as_section_data drop column points_int; + +begin +content_type.refresh_view('as_section_data'); +end; +/ +show errors; + Index: openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.22d6-0.22d7.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.22d6-0.22d7.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.22d6-0.22d7.sql 2 Sep 2008 01:21:08 -0000 1.1 +++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.22d6-0.22d7.sql 7 Sep 2008 19:38:13 -0000 1.2 @@ -1,3 +1,8 @@ +drop view as_itemsx; +drop view as_itemsi cascade; +alter table as_items alter points type float; +select content_type__refresh_view('as_items'); + drop view as_item_datax; drop view as_item_datai cascade; alter table as_item_data alter points type float; @@ -7,3 +12,13 @@ drop view as_session_resultsi cascade; alter table as_session_results alter points type float; select content_type__refresh_view('as_session_results'); + +drop view as_sectionsx; +drop view as_sectionsi cascade; +alter table as_sections alter points type float; +select content_type__refresh_view('as_sections'); + +drop view as_section_datax; +drop view as_section_datai cascade; +alter table as_section_data alter points type float; +select content_type__refresh_view('as_section_data'); Index: openacs-4/packages/assessment/tcl/as-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-install-procs.tcl,v diff -u -r1.39 -r1.40 --- openacs-4/packages/assessment/tcl/as-install-procs.tcl 2 Sep 2008 16:51:58 -0000 1.39 +++ openacs-4/packages/assessment/tcl/as-install-procs.tcl 7 Sep 2008 19:38:13 -0000 1.40 @@ -133,7 +133,7 @@ content::type::attribute::new -content_type {as_items} -attribute_name {max_time_to_complete} -datatype {number} -pretty_name {Item Max Time to Complete} -column_spec {integer} content::type::attribute::new -content_type {as_items} -attribute_name {feedback_wrong} -datatype {text} -pretty_name {Item Right Feedback} -column_spec {text} content::type::attribute::new -content_type {as_items} -attribute_name {feedback_right} -datatype {text} -pretty_name {Item Wrong Feedback} -column_spec {text} -content::type::attribute::new -content_type {as_items} -attribute_name {points} -datatype {number} -pretty_name {Points awarded for this item} -column_spec {integer} +content::type::attribute::new -content_type {as_items} -attribute_name {points} -datatype {number} -pretty_name {Points awarded for this item} -column_spec {float} content::type::attribute::new -content_type {as_items} -attribute_name {validate_block} -datatype {text} -pretty_name {Validation Block} -column_spec {text} # Sections @@ -142,7 +142,7 @@ content::type::attribute::new -content_type {as_sections} -attribute_name {num_items} -datatype {number} -pretty_name {Number of items displayed in this section} -column_spec {integer} content::type::attribute::new -content_type {as_sections} -attribute_name {feedback_text} -datatype {text} -pretty_name {Section Feedback} -column_spec {text} content::type::attribute::new -content_type {as_sections} -attribute_name {max_time_to_complete} -datatype {number} -pretty_name {Section Max Time to Complete} -column_spec {integer} -content::type::attribute::new -content_type {as_sections} -attribute_name {points} -datatype {number} -pretty_name {Points awarded for this section} -column_spec {integer} +content::type::attribute::new -content_type {as_sections} -attribute_name {points} -datatype {number} -pretty_name {Points awarded for this section} -column_spec {float} # Section Display Types content::type::attribute::new -content_type {as_section_display_types} -attribute_name {num_items} -datatype {number} -pretty_name {Number of items displayed per page} -column_spec {integer} @@ -196,7 +196,7 @@ content::type::attribute::new -content_type {as_section_data} -attribute_name {section_id} -datatype {number} -pretty_name {Section ID} -column_spec {integer} content::type::attribute::new -content_type {as_section_data} -attribute_name {subject_id} -datatype {number} -pretty_name {Subject ID} -column_spec {integer} content::type::attribute::new -content_type {as_section_data} -attribute_name {staff_id} -datatype {number} -pretty_name {Staff ID} -column_spec {integer} -content::type::attribute::new -content_type {as_section_data} -attribute_name {points} -datatype {number} -pretty_name {Points Awarded} -column_spec {integer} +content::type::attribute::new -content_type {as_section_data} -attribute_name {points} -datatype {number} -pretty_name {Points Awarded} -column_spec {float} content::type::attribute::new -content_type {as_section_data} -attribute_name {creation_datetime} -datatype {number} -pretty_name {Creation Date Time} -column_spec {timestamptz} content::type::attribute::new -content_type {as_section_data} -attribute_name {completed_datetime} -datatype {number} -pretty_name {Final Submission} -column_spec {timestamptz} @@ -215,14 +215,14 @@ content::type::attribute::new -content_type {as_item_data} -attribute_name {timestamp_answer} -datatype {number} -pretty_name {TimeStamp Answer} -column_spec {timestamptz} content::type::attribute::new -content_type {as_item_data} -attribute_name {content_answer} -datatype {number} -pretty_name {Content Answer} -column_spec {integer} content::type::attribute::new -content_type {as_item_data} -attribute_name {signed_data} -datatype {string} -pretty_name {Signed Data} -column_spec {varchar(500)} -content::type::attribute::new -content_type {as_item_data} -attribute_name {points} -datatype {number} -pretty_name {Points awarded} -column_spec {integer} +content::type::attribute::new -content_type {as_item_data} -attribute_name {points} -datatype {number} -pretty_name {Points awarded} -column_spec {float} content::type::attribute::new -content_type {as_item_data} -attribute_name {as_item_cr_item_id} -datatype {number} -pretty_name {as_item cr_item_id} -column_spec {integer} content::type::attribute::new -content_type {as_item_data} -attribute_name {choice_value} -datatype {text} -pretty_name {Choice Value} # Session results content::type::attribute::new -content_type {as_session_results} -attribute_name {target_id} -datatype {number} -pretty_name {Target Answer} -column_spec {integer} -content::type::attribute::new -content_type {as_session_results} -attribute_name {points} -datatype {number} -pretty_name {Points} -column_spec {integer} +content::type::attribute::new -content_type {as_session_results} -attribute_name {points} -datatype {number} -pretty_name {Points} -column_spec {float} #File Upload Ansers content::type::new -content_type {as_item_type_fu} -supertype {content_revision} -pretty_name {Assessment Item Type File Upload} -pretty_plural {Assessment Item Type File Upload} -table_name {as_item_type_fu} -id_column {as_item_type_id} Index: openacs-4/packages/assessment/www/asm-admin/item-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/assessment/www/asm-admin/item-add.tcl 5 Sep 2008 18:58:06 -0000 1.20 +++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl 7 Sep 2008 19:38:13 -0000 1.21 @@ -96,7 +96,7 @@ if { $type ne "survey"} { ad_form -extend -name item-add -form { - {points:integer,optional,nospell + {points:float,optional,nospell {label "[_ assessment.points_item]"} {html {size 10 maxlength 10}} {value 1} 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.18 -r1.19 --- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 2 Sep 2008 16:48:39 -0000 1.18 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 7 Sep 2008 19:38:13 -0000 1.19 @@ -81,7 +81,7 @@ if { $type ne "survey"} { ad_form -extend -name item_edit_general -form { - {points:integer,optional,nospell + {points:float,optional,nospell {label "[_ assessment.points_item]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.points_item_help]"}