Index: openacs-4/packages/assessment/lib/item-show-display-f.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-f.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/lib/item-show-display-f.adp 4 Jul 2005 15:02:23 -0000 1.1.2.1 @@ -0,0 +1,3 @@ +
+Index: openacs-4/packages/assessment/lib/item-show-display-f.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-f.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/lib/item-show-display-f.tcl 4 Jul 2005 15:02:23 -0000 1.1.2.1 @@ -0,0 +1,10 @@ +# Display shortanswer type data. +# author Timo Hentschel (timo@timohentschel.de) + +db_1row display_type_data {} + +ad_form -name item_show_display_f -mode display -action item-edit-display-f -export { assessment_id section_id as_item_id } -form { + {html_options:text,optional {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {value $html_display_options} {help_text "[_ assessment.Html_Options_help]"}} + {abs_size:text {label "[_ assessment.Absolute_Size]"} {html {size 5 maxlength 5}} {value $abs_size} {help_text "[_ assessment.Absolute_Size_help]"}} + {box_orientation:text {label "[_ assessment.Box_Orientation]"} {value "[_ assessment.$box_orientation]"} {help_text "[_ assessment.Box_Orientation_help]"}} +} Index: openacs-4/packages/assessment/lib/item-show-display-f.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-f.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/lib/item-show-display-f.xql 4 Jul 2005 15:02:23 -0000 1.1.2.1 @@ -0,0 +1,16 @@ + ++
+Index: openacs-4/packages/assessment/lib/item-show-display-fu.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-fu.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/lib/item-show-display-fu.tcl 4 Jul 2005 15:02:23 -0000 1.1.2.1 @@ -0,0 +1,10 @@ +# Display shortanswer type data. +# author Timo Hentschel (timo@timohentschel.de) + +db_1row display_type_data {} + +ad_form -name item_show_display_sb -mode display -action item-edit-display-sb -export { assessment_id section_id as_item_id } -form { + {html_options:text,optional {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {value $html_display_options} {help_text "[_ assessment.Html_Options_help]"}} + {abs_size:text {label "[_ assessment.Absolute_Size]"} {html {size 5 maxlength 5}} {value $abs_size} {help_text "[_ assessment.Absolute_Size_help]"}} + {box_orientation:text {label "[_ assessment.Box_Orientation]"} {value "[_ assessment.$box_orientation]"} {help_text "[_ assessment.Box_Orientation_help]"}} +} Index: openacs-4/packages/assessment/lib/item-show-display-fu.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-fu.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/lib/item-show-display-fu.xql 4 Jul 2005 15:02:23 -0000 1.1.2.1 @@ -0,0 +1,16 @@ + ++
+Index: openacs-4/packages/assessment/lib/item-show-fu.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-fu.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/lib/item-show-fu.tcl 4 Jul 2005 15:02:23 -0000 1.1.2.1 @@ -0,0 +1,9 @@ +# Display short answer type data. +# author Timo Hentschel (timo@timohentschel.de) + +db_1row item_type_data {} +set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] + +ad_form -name item_show_fu -mode display -action item-edit-fu -export { assessment_id section_id as_item_id } -form { + {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {value $title} {help_text "[_ assessment.oq_Title_help]"}} +} Index: openacs-4/packages/assessment/lib/item-show-fu.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-fu.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/lib/item-show-fu.xql 4 Jul 2005 15:02:23 -0000 1.1.2.1 @@ -0,0 +1,17 @@ + ++
+Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-f.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-f.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/www/asm-admin/item-add-display-f.tcl 4 Jul 2005 15:02:24 -0000 1.1.2.1 @@ -0,0 +1,97 @@ +ad_page_contract { + Form to add an item with shortanswer display. + + @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net) + +} { + assessment_id:integer + section_id:integer + as_item_id:integer + after:integer +} -properties { + context:onevalue + page_title:onevalue +} + +set package_id [ad_conn package_id] +permission::require_permission -object_id $package_id -privilege create +permission::require_permission -object_id $assessment_id -privilege admin + +# Get the assessment data +as::assessment::data -assessment_id $assessment_id + +if {![info exists assessment_data(assessment_id)]} { + ad_return_complaint 1 "[_ assessment.Requested_assess_does]" + ad_script_abort +} + +set page_title [_ assessment.add_item_display_f] +set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] + + +set orientation_types [list] +foreach orientation_type [list horizontal vertical] { + lappend orientation_types [list "[_ assessment.$orientation_type]" $orientation_type] +} + + +ad_form -name item_add_display_f -action item-add-display-f -export { assessment_id section_id after } -form { + {as_item_id:key} + {html_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}} + {abs_size:text,nospell {label "[_ assessment.Absolute_Size]"} {html {size 5 maxlength 5}} {help_text "[_ assessment.Absolute_Size_help]"}} + {box_orientation:text(select) {label "[_ assessment.Box_Orientation]"} {options $orientation_types} {help_text "[_ assessment.Box_Orientation_help]"}} +} -edit_request { + set html_options "" + set abs_size "" + set box_orientation "vertical" +} -validate { + {html_options {[as::assessment::check_html_options -options $html_options]} "[_ assessment.error_html_options]"} +} -edit_data { + db_transaction { + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + db_dml update_section_in_assessment {} + set old_item_id $as_item_id + + if {![db_0or1row item_display {}] || $object_type != "as_item_display_f"} { + set as_item_display_id [as::item_display_f::new \ + -html_display_options $html_options \ + -abs_size $abs_size \ + -box_orientation $box_orientation] + + if {![info exists object_type]} { + # first item display mapped + as::item_rels::new -item_rev_id $as_item_id -target_rev_id $as_item_display_id -type as_item_display_rel + } else { + # old item display existing + set as_item_id [as::item::new_revision -as_item_id $as_item_id] + } + } else { + # old f item display existing + set as_item_id [as::item::new_revision -as_item_id $as_item_id] + set as_item_display_id [as::item_display_f::edit \ + -as_item_display_id $as_item_display_id \ + -html_display_options $html_options \ + -abs_size $abs_size \ + -box_orientation $box_orientation] + } + + set old_item_id [as::item::latest -as_item_id $old_item_id -section_id $new_section_id -default 0] + if {$old_item_id == 0} { + db_dml move_down_items {} + incr after + db_dml insert_new_item {} + } else { + db_dml update_item_display {} + db_1row item_data {} + db_dml update_item {} + } + } +} -after_submit { + # now go to assessment-page + ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_script_abort +} + +ad_return_template Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-f.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-f.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/www/asm-admin/item-add-display-f.xql 4 Jul 2005 15:02:24 -0000 1.1.2.1 @@ -0,0 +1,88 @@ + ++
+Index: openacs-4/packages/assessment/www/asm-admin/item-add-fu.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-fu.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/www/asm-admin/item-add-fu.tcl 4 Jul 2005 15:02:24 -0000 1.1.2.1 @@ -0,0 +1,76 @@ +ad_page_contract { + Form to add a short answer item. + + @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net) + @creation date 2005-06-23 +} { + assessment_id:integer + section_id:integer + as_item_id:integer + after:integer +} -properties { + context:onevalue + page_title:onevalue +} + +set package_id [ad_conn package_id] +permission::require_permission -object_id $package_id -privilege create +permission::require_permission -object_id $assessment_id -privilege admin + +# Get the assessment data +as::assessment::data -assessment_id $assessment_id + +if {![info exists assessment_data(assessment_id)]} { + ad_return_complaint 1 "[_ assessment.Requested_assess_does]" + ad_script_abort +} + +set page_title [_ assessment.add_item_type_fu] +set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] + + +set display_types [list] +foreach display_type [db_list display_types {}] { + lappend display_types [list "[_ assessment.item_display_$display_type]" $display_type] +} + + +ad_form -name item_add_fu -action item-add-fu -export { assessment_id section_id after } -form { + {as_item_id:key} + {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.fu_Title_help]"}} + {display_type:text(select) {label "[_ assessment.Display_Type]"} {options $display_types} {help_text "[_ assessment.Display_Type_help]"}} +} -edit_request { + set title "" + set display_type "f" +} -edit_data { + db_transaction { + if {![db_0or1row item_type {}] || $object_type != "as_item_type_fu"} { + set as_item_type_id [as::item_type_fu::new -title $title ] + + if {![info exists object_type]} { + # first item type mapped + as::item_rels::new -item_rev_id $as_item_id -target_rev_id $as_item_type_id -type as_item_type_rel + } else { + # old item type existing + set as_item_id [as::item::new_revision -as_item_id $as_item_id] + db_dml update_item_type {} + } + } else { + # old fu item type existing + set as_item_id [as::item::new_revision -as_item_id $as_item_id] + set as_item_type_id [as::item_type_fu::edit \ + -as_item_type_id $as_item_type_id \ + -title $title \ + -increasing_p $increasing_p \ + -allow_negative_p $allow_negative_p] + + db_dml update_item_type {} + } + } +} -after_submit { + # now go to display-type specific form (i.e. textbox) + ad_returnredirect [export_vars -base "item-add-display-$display_type" {assessment_id section_id as_item_id after}] + ad_script_abort +} + +ad_return_template Index: openacs-4/packages/assessment/www/asm-admin/item-add-fu.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-fu.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/www/asm-admin/item-add-fu.xql 4 Jul 2005 15:02:24 -0000 1.1.2.1 @@ -0,0 +1,37 @@ + ++
+Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.tcl 4 Jul 2005 15:02:24 -0000 1.1.2.1 @@ -0,0 +1,89 @@ +ad_page_contract { + Form to edit an item with shortanswer display. + + @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net) + @cvs-id $Id: +} { + assessment_id:integer + section_id:integer + as_item_id:integer +} -properties { + context_bar:onevalue + page_title:onevalue +} + +set package_id [ad_conn package_id] +permission::require_permission -object_id $package_id -privilege create +permission::require_permission -object_id $assessment_id -privilege admin + +# Get the assessment data +as::assessment::data -assessment_id $assessment_id + +if {![info exists assessment_data(assessment_id)]} { + ad_return_complaint 1 "[_ assessment.Requested_assess_does]" + ad_script_abort +} + +set page_title [_ assessment.edit_item_display_f] +set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] + +set orientation_types [list] +foreach orientation_type [list horizontal vertical] { + lappend orientation_types [list "[_ assessment.$orientation_type]" $orientation_type] +} + + +ad_form -name item_edit_display_f -action item-edit-display-f -export { assessment_id section_id } -form { + {as_item_id:key} + {html_display_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}} + {abs_size:text,nospell {label "[_ assessment.Absolute_Size]"} {html {size 5 maxlength 5}} {help_text "[_ assessment.Absolute_Size_help]"}} + {box_orientation:text(select) {label "[_ assessment.Box_Orientation]"} {options $orientation_types} {help_text "[_ assessment.Box_Orientation_help]"}} + {as_item_display_id:text(hidden)} +} -edit_request { + db_1row last_used_display_type {} + if {![empty_string_p $as_item_display_id]} { + db_1row display_type_data {} + } else { + # default data if display newly mapped + set html_display_options "" + set abs_size 5 + set box_orientation "vertical" + set as_item_display_id 0 + } +} -validate { + {html_display_options {[as::assessment::check_html_options -options $html_display_options]} "[_ assessment.error_html_options]"} +} -edit_data { + db_transaction { + set new_item_id [as::item::new_revision -as_item_id $as_item_id] + + if {$as_item_display_id} { + # edit existing display type + set new_item_display_id [as::item_display_f::edit \ + -as_item_display_id $as_item_display_id \ + -html_display_options $html_display_options \ + -abs_size $abs_size \ + -box_orientation $box_orientation] + } else { + # create new display type + set new_item_display_id [as::item_display_f::new \ + -html_display_options $html_display_options \ + -abs_size $abs_size \ + -box_orientation $box_orientation] + } + + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + db_dml update_section_in_assessment {} + db_dml update_item_in_section {} + db_dml update_display_of_item {} + } + set as_item_id $new_item_id + set section_id $new_section_id +} -after_submit { + ad_returnredirect [export_vars -base "item-edit" {assessment_id section_id as_item_id}] + ad_script_abort +} + +ad_return_template Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.xql 4 Jul 2005 15:02:24 -0000 1.1.2.1 @@ -0,0 +1,62 @@ + ++
+Index: openacs-4/packages/assessment/www/asm-admin/item-edit-fu.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-fu.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-fu.tcl 4 Jul 2005 15:02:24 -0000 1.1.2.1 @@ -0,0 +1,61 @@ +ad_page_contract { + Form to edit a short answer item. + + @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net) + +} { + assessment_id:integer + section_id:integer + as_item_id:integer +} -properties { + context:onevalue + page_title:onevalue +} + +set package_id [ad_conn package_id] +permission::require_permission -object_id $package_id -privilege create +permission::require_permission -object_id $assessment_id -privilege admin + +# Get the assessment data +as::assessment::data -assessment_id $assessment_id + +if {![info exists assessment_data(assessment_id)]} { + ad_return_complaint 1 "[_ assessment.Requested_assess_does]" + ad_script_abort +} + +set page_title [_ assessment.edit_item_type_fu] +set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] + +set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] + + +ad_form -name item_edit_fu -action item-edit-fu -export { assessment_id section_id } -form { + {as_item_id:key} + {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.oq_Title_help]"}} +} -edit_request { + db_1row item_type_data {} +} -edit_data { + db_transaction { + set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set as_item_type_id [db_string item_type_id {}] + set new_item_type_id [as::item_type_fu::edit \ + -as_item_type_id $as_item_type_id \ + -title $title] + + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + db_dml update_section_in_assessment {} + db_dml update_item_in_section {} + db_dml update_item_type {} + } + set as_item_id $new_item_id + set section_id $new_section_id +} -after_submit { + ad_returnredirect [export_vars -base "item-edit" {assessment_id section_id as_item_id}] + ad_script_abort +} + +ad_return_template Index: openacs-4/packages/assessment/www/asm-admin/item-edit-fu.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-fu.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-fu.xql 4 Jul 2005 15:03:11 -0000 1.1.2.1 @@ -0,0 +1,61 @@ + ++