Index: openacs-4/packages/assessment/assessment.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v diff -u -r1.36.2.8 -r1.36.2.9 --- openacs-4/packages/assessment/assessment.info 3 Aug 2005 05:51:15 -0000 1.36.2.8 +++ openacs-4/packages/assessment/assessment.info 29 Oct 2005 19:52:54 -0000 1.36.2.9 @@ -7,7 +7,7 @@ f f - + Eduardo Perez Ureta Assessment package that will replace the survey, quizz, complex survey, poll and other data collection packages @@ -17,7 +17,7 @@ Create assessments and evaluate. 0 - + 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.68.2.13 -r1.68.2.14 --- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 6 Sep 2005 05:50:10 -0000 1.68.2.13 +++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 29 Oct 2005 19:52:54 -0000 1.68.2.14 @@ -1,5 +1,5 @@ - + Above Absolute Size @@ -174,13 +174,15 @@ Is this the correct answer? Created by End Time + Select an end date. This field is optional. CSV Export CSV Export Format Select one of the above, the selected field is goint to identify the question in your csv file. Question Field Name Question Text CSV file Start Time + Select a start date. This field is optional. Currently: Data Type Boolean @@ -332,6 +334,7 @@ Everyone eligible to take this assessment Everyone who has already completed this assessment Everyone who has not yet completed this assessment + Prepend an empty item to the list Make anonymous Make editable Hide item name @@ -425,6 +428,7 @@ Points for Section How many points is this section worth in an assessment. This is a measurement for relative difficulty. Post Check + Prepend Empty Item Preview Query Question Index: openacs-4/packages/assessment/lib/item-show-display-sb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-sb.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/lib/item-show-display-sb.tcl 29 Mar 2005 10:53:34 -0000 1.2 +++ openacs-4/packages/assessment/lib/item-show-display-sb.tcl 29 Oct 2005 19:52:54 -0000 1.2.2.1 @@ -8,4 +8,5 @@ {html_options:text,optional {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {value $html_display_options} {help_text "[_ assessment.Html_Options_help]"}} {multiple_p:text(select) {label "[_ assessment.Multiple]"} {options $boolean_options} {value $multiple_p} {help_text "[_ assessment.Multiple_help]"}} {order_type:text {label "[_ assessment.Order_Type]"} {value "[_ assessment.$sort_order_type]"} {help_text "[_ assessment.Order_Type_help]"}} + {prepend_empty_p:text(select) {label "[_ assessment.Prepend_Empty_Item]"} {options $boolean_options} {value $prepend_empty_p} {help_text "[_ assessment.lt_Prepend_an_empty_item]"}} } Index: openacs-4/packages/assessment/lib/item-show-display-sb.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-sb.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/assessment/lib/item-show-display-sb.xql 8 Dec 2004 15:30:32 -0000 1.1 +++ openacs-4/packages/assessment/lib/item-show-display-sb.xql 29 Oct 2005 19:52:54 -0000 1.1.2.1 @@ -5,7 +5,7 @@ select d.html_display_options, d.multiple_p, d.choice_label_orientation, - d.sort_order_type, d.item_answer_alignment + d.sort_order_type, d.item_answer_alignment, d.prepend_empty_p from as_item_display_sb d, as_item_rels r where d.as_item_display_id = r.target_rev_id and r.item_rev_id = :as_item_id Index: openacs-4/packages/assessment/sql/oracle/assessment-item-type-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/assessment-item-type-create.sql,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/sql/oracle/assessment-item-type-create.sql 21 Feb 2005 14:32:55 -0000 1.4 +++ openacs-4/packages/assessment/sql/oracle/assessment-item-type-create.sql 29 Oct 2005 19:52:53 -0000 1.4.2.1 @@ -99,7 +99,10 @@ -- order in which the choices will appear (numerical, alphabetic, randomized or by order of entry) sort_order_type varchar(20), -- the orientation between the "question part" of the Item (the title/subtext) and the "answer part" (beside-left, beside-right, bellow, above) - item_answer_alignment varchar(20) + item_answer_alignment varchar(20), + + -- prepend an empty item to the list, useful for validation of a required sb but you don't want any option as selected by default + prepend_empty_p char(1) default 'f' ); -- Textbox Display Type Index: openacs-4/packages/assessment/sql/postgresql/assessment-item-type-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-item-type-create.sql,v diff -u -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/assessment/sql/postgresql/assessment-item-type-create.sql 4 Jul 2005 15:02:23 -0000 1.9.2.1 +++ openacs-4/packages/assessment/sql/postgresql/assessment-item-type-create.sql 29 Oct 2005 19:52:53 -0000 1.9.2.2 @@ -99,7 +99,10 @@ -- order in which the choices will appear (numerical, alphabetic, randomized or by order of entry) sort_order_type varchar(20), -- the orientation between the "question part" of the Item (the title/subtext) and the "answer part" (beside-left, beside-right, bellow, above) - item_answer_alignment varchar(20) + item_answer_alignment varchar(20), + + -- prepend an empty item to the list, useful for validation of a required sb but you don't want any option as selected by default + prepend_empty_p char(1) default 'f' ); -- Textbox Display Type Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-0.15-0.16.sql'. Fisheye: No comparison available. Pass `N' to diff? 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.30.2.11 -r1.30.2.12 --- openacs-4/packages/assessment/tcl/as-install-procs.tcl 1 Aug 2005 18:07:55 -0000 1.30.2.11 +++ openacs-4/packages/assessment/tcl/as-install-procs.tcl 29 Oct 2005 19:52:53 -0000 1.30.2.12 @@ -61,6 +61,7 @@ content::type::attribute::new -content_type {as_item_display_sb} -attribute_name {multiple_p} -datatype {string} -pretty_name {Allow Multiple} -column_spec {char(1)} content::type::attribute::new -content_type {as_item_display_sb} -attribute_name {sort_order_type} -datatype {string} -pretty_name {Sort Order Type} -column_spec {varchar(20)} content::type::attribute::new -content_type {as_item_display_sb} -attribute_name {item_answer_alignment} -datatype {string} -pretty_name {Item Answer Alignment} -column_spec {varchar(20)} +content::type::attribute::new -content_type {as_item_display_sb} -attribute_name {prepend_empty_p} -datatype {string} -pretty_name {Prepend Empty Item} -column_spec {char(1)} # Textbox display type content::type::attribute::new -content_type {as_item_display_tb} -attribute_name {html_display_options} -datatype {string} -pretty_name {HTML display Options} -column_spec {varchar(50)} @@ -421,6 +422,9 @@ } } + 0.15 0.16 { + content::type::attribute::new -content_type {as_item_display_sb} -attribute_name {prepend_empty_p} -datatype {string} -pretty_name {Prepend Empty Item} -column_spec {char(1)} + } } } Index: openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl 31 May 2005 23:13:00 -0000 1.10.2.1 +++ openacs-4/packages/assessment/tcl/as-item-display-sb-procs.tcl 29 Oct 2005 19:52:53 -0000 1.10.2.2 @@ -12,6 +12,7 @@ {-choice_label_orientation ""} {-sort_order_type ""} {-item_answer_alignment ""} + {-prepend_empty_p "f"} } { @author Timo Hentschel (timo@timohentschel.de) @creation-date 2004-12-08 @@ -31,7 +32,8 @@ [list mulitple_p $multiple_p] \ [list choice_label_orientation $choice_label_orientation] \ [list sort_order_type $sort_order_type] \ - [list item_answer_alignment $item_answer_alignment] ] ] + [list item_answer_alignment $item_answer_alignment] \ + [list prepend_empty_p $prepend_empty_p] ] ] } return $as_item_display_sb_id @@ -44,6 +46,7 @@ {-choice_label_orientation ""} {-sort_order_type ""} {-item_answer_alignment ""} + {-prepend_empty_p "f"} } { @author Timo Hentschel (timo@timohentschel.de) @creation-date 2004-12-08 @@ -60,7 +63,8 @@ [list multiple_p $multiple_p] \ [list choice_label_orientation $choice_label_orientation] \ [list sort_order_type $sort_order_type] \ - [list item_answer_alignment $item_answer_alignment] ] ] + [list item_answer_alignment $item_answer_alignment] \ + [list prepend_empty_p $prepend_empty_p] ] ] } return $new_item_display_id @@ -133,6 +137,10 @@ } } + if { $type(prepend_empty_p) == "t" } { + set data [linsert $data 0 [list "" ""]] + } + set optional "" if {$required_p != "t"} { set optional ",optional" Index: openacs-4/packages/assessment/tcl/as-item-display-sb-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-display-sb-procs.xql,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/assessment/tcl/as-item-display-sb-procs.xql 13 Apr 2005 18:51:54 -0000 1.4 +++ openacs-4/packages/assessment/tcl/as-item-display-sb-procs.xql 29 Oct 2005 19:52:53 -0000 1.4.2.1 @@ -15,7 +15,7 @@ select i.html_display_options, i.multiple_p, i.choice_label_orientation, - i.sort_order_type, i.item_answer_alignment + i.sort_order_type, i.item_answer_alignment, i.prepend_empty_p from cr_revisions cr, as_item_display_sb i where cr.revision_id = :type_id and i.as_item_display_id = cr.revision_id @@ -27,7 +27,7 @@ select html_display_options, multiple_p, choice_label_orientation, - sort_order_type, item_answer_alignment + sort_order_type, item_answer_alignment, prepend_empty_p from as_item_display_sb where as_item_display_id = :type_id Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl,v diff -u -r1.5.2.2 -r1.5.2.3 --- openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl 20 Jul 2005 16:25:57 -0000 1.5.2.2 +++ openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl 29 Oct 2005 19:52:52 -0000 1.5.2.3 @@ -110,13 +110,15 @@ {multiple_p:text(select) {label "[_ assessment.Multiple]"} {options $boolean_options} {help_text "[_ assessment.Multiple_help]"}} {label_orientation:text(hidden)} {order_type:text(select) {label "[_ assessment.Order_Type]"} {options $order_types} {help_text "[_ assessment.Order_Type_help]"}} + {prepend_empty_p:text(select) {label "[_ assessment.Prepend_Empty_Item]"} {options $boolean_options} {help_text "[_ assessment.lt_Prepend_an_empty_item]"}} {answer_alignment:text(hidden)} } -edit_request { set html_options "" set multiple_p f set label_orientation "top" set order_type "order_of_entry" set answer_alignment "besideright" + set prepend_empty_p f } -validate { {html_options {[as::assessment::check_html_options -options $html_options]} "[_ assessment.error_html_options]"} } -edit_data { @@ -133,7 +135,8 @@ -multiple_p $multiple_p \ -choice_label_orientation $label_orientation \ -sort_order_type $order_type \ - -item_answer_alignment $answer_alignment] + -item_answer_alignment $answer_alignment \ + -prepend_empty_p $prepend_empty_p] if {![info exists object_type]} { # first item display mapped @@ -151,7 +154,8 @@ -multiple_p $multiple_p \ -choice_label_orientation $label_orientation \ -sort_order_type $order_type \ - -item_answer_alignment $answer_alignment] + -item_answer_alignment $answer_alignment \ + -prepend_empty_p $prepend_empty_p] } set old_item_id [as::item::latest -as_item_id $old_item_id -section_id $new_section_id -default 0] Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl 7 Apr 2005 22:45:54 -0000 1.7 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl 29 Oct 2005 19:52:52 -0000 1.7.2.1 @@ -52,6 +52,7 @@ {choice_label_orientation:text(hidden)} {sort_order_type:text(select) {label "[_ assessment.Order_Type]"} {options $order_types} {help_text "[_ assessment.Order_Type_help]"}} {item_answer_alignment:text(hidden)} + {prepend_empty_p:text(select) {label "[_ assessment.Prepend_Empty_Item]"} {options $boolean_options} {help_text "[_ assessment.lt_Prepend_an_empty_item]"}} {as_item_display_id:text(hidden)} } -edit_request { db_1row last_used_display_type {} @@ -65,6 +66,7 @@ set sort_order_type "order_of_entry" set item_answer_alignment "besideright" set as_item_display_id 0 + set prepend_empty_p f } } -validate { {html_display_options {[as::assessment::check_html_options -options $html_display_options]} "[_ assessment.error_html_options]"} @@ -80,15 +82,17 @@ -multiple_p $multiple_p \ -choice_label_orientation $choice_label_orientation \ -sort_order_type $sort_order_type \ - -item_answer_alignment $item_answer_alignment] + -item_answer_alignment $item_answer_alignment \ + -prepend_empty_p $prepend_empty_p] } else { # create new display type set new_item_display_id [as::item_display_sb::new \ -html_display_options $html_display_options \ -multiple_p $multiple_p \ -choice_label_orientation $choice_label_orientation \ -sort_order_type $sort_order_type \ - -item_answer_alignment $item_answer_alignment] + -item_answer_alignment $item_answer_alignment \ + -prepend_empty_p $prepend_empty_p] } set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.xql 1 Feb 2005 22:00:10 -0000 1.1 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.xql 29 Oct 2005 19:52:52 -0000 1.1.2.1 @@ -19,7 +19,7 @@ select d.html_display_options, d.multiple_p, d.choice_label_orientation, - d.sort_order_type, d.item_answer_alignment + d.sort_order_type, d.item_answer_alignment, d.prepend_empty_p from cr_revisions r, as_item_display_sb d where r.revision_id = d.as_item_display_id and d.as_item_display_id = :as_item_display_id