+
+
+Export Report. (Please be patient, this may take 15-20 seconds.)
++
+ Associate a report to this survey
+Note: Creating a new report does not automatically associate at this point. After creating a new report, click on associate a report to this survey.
please use another Template Name" + } + {name + {![regexp {[^a-zA-z0-9\-_]} $name]} + "Illegal characters in name" + } +} -edit_request { + if {[ns_queryget "form:mode"] eq "display"} { + element set_properties simpleform submit1 label "OK" + element set_properties simpleform submit2 label "OK" + } + db_1row get_revision "select cr.*, ci.name, ci.parent_id from cr_revisions cr, cr_items ci where cr.item_id=ci.item_id and cr.revision_id=:revision_id" -column_array one_revision + set item_id $one_revision(item_id) + set name $one_revision(name) + set title $one_revision(title) + set description $one_revision(description) + set folder_id $one_revision(parent_id) + + # For now, just show the template thats in the database + # DAVEB + + # set template_dir [parameter::get -parameter TemplateRoot] + # set template_root_id [parameter::get -parameter template_folder_id] + # set template_path [db_string get_url "select content_item__get_path(:item_id,:template_root_id)"] + # set template_root "[acs_root_dir]/${template_dir}" + #set template_filename "${template_root}/${template_path}.adp" + #ns_log notice "DAVEB: template-form template_filename $template_filename" + # # read the file contents from the file system + # if {[file exists $template_filename]} { + # set content [template::util::read_file $template_filename] + # } else { + set content [template::util::richtext::create $one_revision(content) "text/html"] + # } + +} -edit_data { + set content [template::util::richtext::get_property contents $content] + set new_revision_id [content::revision::new -item_id $item_id -title $title -content $content -description $description] + +# bcms::item::set_item -item_id $item_id -name $name + + content::item::get -item_id $item_id -array_name item + ad_returnredirect [export_vars -base [ad_conn url] {{revision_id $new_revision_id}}] +} -new_data { + + set template_filename "[acs_root_dir]/packages/survey/www/reports/${name}.adp" + # read the file contents from the file system + if {[file exists $template_filename] && [empty_string_p $content]} { + set content [template::util::read_file $template_filename] + } + +# set content [demoronise $content] + + # create the template and revision + db_transaction { + set item_id [content::item::new -name $name -parent_id $parent_id] + set revision_id [content::revision::new -item_id $item_id \ + -title $title -content $content -description $description] + } + +} -after_submit { + ad_returnredirect $return_url + ad_script_abort +} + +ad_return_template "/packages/survey-reports/lib/simple-form" + + Index: openacs-4/packages/survey-reports/sql/postgresql/survey-reports-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/sql/postgresql/survey-reports-create.sql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/survey-reports/sql/postgresql/survey-reports-create.sql 14 Nov 2005 04:31:01 -0000 1.2 @@ -0,0 +1,23 @@ +-- +-- packages/survey/sql/postgresql/survey-reports-create.sql +-- +-- @author Deds Castillo (deds@i-manila.com.ph) +-- @creation-date 2004-10-21 +-- @arch-tag: 3e2487d0-6986-4257-ba5e-a352d23a0c8e +-- @cvs-id $Id: survey-reports-create.sql,v 1.2 2005/11/14 04:31:01 daveb Exp $ +-- + +create table survey_reports_survey_map ( + template_id integer + constraint surv_rep_surv_map_template_id_fk + references cr_items + on delete cascade, + survey_id integer + constraint surv_rep_surv_map_survey_id_fk + references surveys + on delete cascade, + primary key (template_id, survey_id), + survey_variables_p boolean, + survey_show_report_p boolean +); + Index: openacs-4/packages/survey-reports/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/tcl/apm-callback-procs.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/survey-reports/tcl/apm-callback-procs.tcl 14 Nov 2005 04:31:01 -0000 1.2 @@ -0,0 +1,52 @@ +# + +ad_library { + + Install and setup survey reports + + @author Dave Bauer (dave@thedesignexperience.org) + @creation-date 2005-11-01 + @arch-tag: 45462fee-df1c-408d-b84d-2206ebf59b76 + @cvs-id $Id: apm-callback-procs.tcl,v 1.2 2005/11/14 04:31:01 daveb Exp $ +} + +namespace eval survey_reports::install {} + +ad_proc -private survey_reports::install::after_instantiate { + -package_id +} { + + Setup folder + + @author Dave Bauer (dave@thedesignexperience.org) + @creation-date 2005-11-01 + + @return + + @error +} { + content::folder::new \ + -name "survey_reports_${package_id}_root_folder" \ + -parent_id "-200" \ + -package_id $package_id +} + +ad_proc -private survey_reports::install::before_uninstantiate { + -package_id +} { + Remove folder and contents + + @author Dave Bauer (dave@thedesignexperience.org) + @creation-date 2005-11-01 + + @param package_id + + @return + + @error +} { + set folder_id [content::item::get_id -path "survey_reports_${package_id}_root_folder" -root_folder_id "-200"] + content::folder::delete \ + -folder_id $folder_id \ + -cascade_p t +} Index: openacs-4/packages/survey-reports/tcl/survey-report-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/tcl/survey-report-procs.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/survey-reports/tcl/survey-report-procs.tcl 14 Nov 2005 04:31:01 -0000 1.2 @@ -0,0 +1,126 @@ +# packages/survey/tcl/survey-report-procs.tcl + +ad_library { + + survey report library + + @author Deds Castillo (deds@i-manila.com.ph) + @creation-date 2004-10-21 + @arch-tag: 3bb8b8a0-8149-465b-8820-42e08b817693 + @cvs-id $Id: survey-report-procs.tcl,v 1.2 2005/11/14 04:31:01 daveb Exp $ +} + +namespace eval survey::report {} + +ad_proc -public survey::report::get_root_folder_name { + -package_id:required +} { + gets the root folder name for a particular survey note that this + assumes a specific name. + + @author Deds Castillo (deds@i-manila.com.ph) + @creation-date 2004-10-21 + + @param package_id + + @return + + @error +} { + return "survey_reports_${package_id}_root_folder" +} + + +ad_proc -public survey::report::get_root_folder { + -package_id +} { + gets the root template folder of a survey package. returns empty + string if none found. + + @author Deds Castillo (deds@i-manila.com.ph) + @creation-date 2004-10-21 + + @param package_id + + @return + + @error +} { + if {![exists_and_not_null package_id]} { + set package_id [ad_conn package_id] + } + + set folder_name [get_root_folder_name -package_id $package_id] + + set template_root_id -200 + + set root_folder_id [db_string get_root_folder { + select f.folder_id + from cr_items i, + cr_folders f + where f.folder_id = i.item_id + and i.parent_id = :template_root_id + and i.name = :folder_name + } -default ""] + + return $root_folder_id +} + +ad_proc -public survey::report::init_root_folder { + -package_id +} { + creates a root folder for a survey package if there is none + + @author Deds Castillo (deds@i-manila.com.ph) + @creation-date 2004-10-21 + + @param package_id + + @return + + @error +} { + if {![exists_and_not_null package_id]} { + set package_id [ad_conn package_id] + } + + set root_folder_id [get_root_folder -package_id $package_id] + if {[empty_string_p $root_folder_id]} { + set root_folder_id [bcms::folder::create_folder \ + -name [get_root_folder_name -package_id $package_id] \ + -folder_label "Survey Reports" \ + -parent_id [bcms::template::get_cr_root_template_folder] \ + -description "Survey Report Templates for survey package $package_id" \ + -package_id $package_id \ + -context_id $package_id \ + -content_types "content_template" + ] + } + + return $root_folder_id +} + +ad_proc -public survey::report::get_template { + -survey_id:required +} { + gets the associated template for a survey. 0 if none. + + @author Deds Castillo (deds@i-manila.com.ph) + @creation-date 2004-10-21 + + @param survey_id + + @return + + @error +} { + set template_id [db_string get_report { + select template_id + from survey_reports_survey_map + where survey_id = :survey_id + and survey_show_report_p = 't' + limit 1 + } -default 0] + + return $template_id +} Index: openacs-4/packages/survey-reports/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/www/index.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/survey-reports/www/index.adp 14 Nov 2005 04:31:01 -0000 1.2 @@ -0,0 +1,5 @@ +
- "
+ foreach c $choice_percents {
+ append ${full_id}_cp "
- $choice_percent_array($c) " + } + append ${full_id}_cp "
+For this report you have not yet answered:
+
-
+
- @survey_info.name;noquote@
+
- "
+ set ${full_id}_mean 0
+ set n 0
+ set points 0
+ db_foreach get_counts "select tr.total_responses, count(sqr.choice_id) as choice_count, to_char(((count(sqr.choice_id) / tr.total_responses :: float) * 100), '999.99%') as p ,sqr.choice_id, sqc.label, sqc.numeric_value from (select count(*) as total_responses from survey_question_responses where question_id=:question_id) as tr, survey_question_responses sqr left join survey_question_choices sqc on sqr.choice_id=sqc.choice_id where sqr.question_id=:question_id group by sqr.choice_id, sqc.label, sqc.numeric_value, sqc.sort_order, tr.total_responses order by sqc.sort_order" {
+ lappend mode_values $choice_count
+ lappend mode_choice_ids $choice_id
+ set choice_percent_array(${p}_${choice_id}) "${label}: ${p}"
+
+ if { [empty_string_p $numeric_value] } {
+ set numeric_value 0
+ }
+
+ if {![empty_string_p $label] && ![string equal $choice_count 0]} {
+ append ${full_id}_c "
- $label: $choice_count " + incr n $choice_count + set points [expr $points + $choice_count * $numeric_value] + set ${full_id}_mean [expr [set ${full_id}_mean] + $choice_count * $numeric_value] + append ${full_id}_d "$numeric_value: $choice_count
" + } + lappend var_names "${full_id}_d" + } + append ${full_id}_c "
- "
+ foreach c $choice_percents {
+ append ${full_id}_cp "
- $choice_percent_array($c) " + } + append ${full_id}_cp "
- "
+ set ${full_id}_mean 0
+ set n 0
+ set points 0
+ db_foreach get_counts "select tr.total_responses, count(sqr.choice_id) as choice_count, to_char(((count(sqr.choice_id) / tr.total_responses :: float) * 100), '999.99%') as p ,sqr.choice_id, sqc.label, sqc.numeric_value from (select count(*) as total_responses from survey_question_responses where question_id=:question_id) as tr, survey_question_responses sqr left join survey_question_choices sqc on sqr.choice_id=sqc.choice_id where sqr.question_id=:question_id group by sqr.choice_id, sqc.label, sqc.numeric_value, sqc.sort_order, tr.total_responses order by sqc.sort_order" {
+ set choice_percent_array(${p}_${choice_id}) "${label}: ${p}"
+ set choice_count_array(${choice_count}_${choice_id}) "${label}: ${choice_count}"
+
+ if { [empty_string_p $numeric_value] } {
+ set numeric_value 0
+ }
+
+ append ${full_id}_c "
- $label: $choice_count " + incr n $choice_count + set points [expr $points + $choice_count * $numeric_value] + set ${full_id}_mean [expr [set ${full_id}_mean] + $choice_count * $numeric_value] + } + append ${full_id}_c "
- "
+ foreach c $choice_percents {
+ append ${full_id}_cp "
- $choice_percent_array($c) " + } + append ${full_id}_cp "
| +This page lets you write a template for displaying a report on the above surveys. In the template you can have HTML, +variable references, and conditional text. Variable references consist of putting '@' around the variable name. Below is +a table of the names defined for this survey. If there was no response to a particular question, then the corresponding +variable will contain an empty string. Conditional text consists of text surrounded by <if>, +<elseif>, <else>, <switch>, +<case>, or <default> tags. See the +if, elseif, and else tag and +switch, case, and default tag references for more details. + | +||
| Standard for all Reports | ||
|---|---|---|
| User Info These are standard variables defined for the user viewing the report. |
+
|
+|
| Survey Info | +@response_date@ | +Date the user last took the survey | +
| + |
|
+Edit this response | +
| Section: @vars.name@ (@vars.section_pretty_id@) | +Variable Names | +Possible Answers (type or choices) | +
| Question |
+@@vars.full_id@@ \@@vars.full_id@_median\@ |
+@vars.possible_values;noquote@ | +
@${full_id}_cid_${sort_order}@
@${full_id}_cid_${sort_order}_percent@
@${full_id}_cid_${sort_order}_label@
" + } + set possible_values "[join $answer_list "
"]" + } + "text" - + "shorttext" { + set possible_values "text string" + } + "boolean" { + set possible_values "boolean (use <if @var@ true> or <if @var@ false>)" + } + default { + set possible_values "$abstract_data_type" + } + } + + } +} else { + set no_surveys_associated_p 1 +} Index: openacs-4/packages/survey-reports/www/manage/folder-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/www/manage/folder-view.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/survey-reports/www/manage/folder-view.adp 14 Nov 2005 04:31:02 -0000 1.2 @@ -0,0 +1,14 @@ +
+
Index: openacs-4/packages/survey-reports/www/manage/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/www/manage/master.tcl,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/survey-reports/www/manage/master.tcl 14 Nov 2005 04:31:02 -0000 1.2
@@ -0,0 +1,21 @@
+# packages/survey/www/admin/reports/manage/master.tcl
+
+ad_page_contract {
+
+ master template
+
+ @author Deds Castillo (deds@i-manila.com.ph)
+ @creation-date 2004-10-21
+ @arch-tag: 65a1e87d-e753-436b-a44a-3ca53452b2e2
+ @cvs-id $Id: master.tcl,v 1.2 2005/11/14 04:31:02 daveb Exp $
+} {
+
+} -properties {
+} -validate {
+} -errors {
+}
+
+set package_url [ad_conn package_url]
+set current_url [ad_return_url]
+
+set context {}
\ No newline at end of file
Index: openacs-4/packages/survey-reports/www/manage/survey-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/www/manage/survey-add.tcl,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/survey-reports/www/manage/survey-add.tcl 14 Nov 2005 04:31:02 -0000 1.2
@@ -0,0 +1,36 @@
+# packages/survey/www/admin/reports/manage/survey-add.tcl
+
+ad_page_contract {
+
+ associates a survey to template
+
+ @author Deds Castillo (deds@i-manila.com.ph)
+ @creation-date 2004-10-21
+ @arch-tag: 1fafaa35-f25d-4734-86c7-07bacca70e8e
+ @cvs-id $Id: survey-add.tcl,v 1.2 2005/11/14 04:31:02 daveb Exp $
+} {
+ item_id:notnull
+ survey_id:notnull
+ return_url:notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+set exists_p [db_string get_exists {
+ select count(*)
+ from survey_reports_survey_map
+ where template_id = :item_id
+ and survey_id = :survey_id
+}]
+
+if {!$exists_p} {
+ db_dml insert_it {
+ insert into survey_reports_survey_map
+ (template_id, survey_id, survey_variables_p, survey_show_report_p)
+ values
+ (:item_id, :survey_id,'t','f')
+ }
+}
+
+ad_returnredirect $return_url
Index: openacs-4/packages/survey-reports/www/manage/survey-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/www/manage/survey-delete.tcl,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/survey-reports/www/manage/survey-delete.tcl 14 Nov 2005 04:31:02 -0000 1.2
@@ -0,0 +1,37 @@
+# packages/survey/www/admin/reports/manage/survey-delete.tcl
+
+ad_page_contract {
+
+
+
+ @author Deds Castillo (deds@i-manila.com.ph)
+ @creation-date 2004-10-21
+ @arch-tag: 7efe0a32-068e-4b40-895a-4de7a3fcafb7
+ @cvs-id $Id: survey-delete.tcl,v 1.2 2005/11/14 04:31:02 daveb Exp $
+} {
+ survey_id:optional,notnull,multiple
+ item_id:notnull
+ return_url:notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+if {![info exists survey_id]} {
+ ad_returnredirect $return_url
+}
+
+if {[llength $survey_id] == 1} {
+ set survey_id [split [lindex $survey_id 0]]
+}
+
+foreach one_survey $survey_id {
+ db_dml delete {
+ delete
+ from survey_templates_survey_map
+ where survey_id = :one_survey
+ and template_id = :item_id
+ }
+}
+
+ad_returnredirect $return_url
Index: openacs-4/packages/survey-reports/www/manage/survey.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/www/manage/survey.tcl,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/survey-reports/www/manage/survey.tcl 14 Nov 2005 04:31:02 -0000 1.2
@@ -0,0 +1,25 @@
+# packages/survey/www/admin/reports/manage/survey.tcl
+
+ad_page_contract {
+
+
+
+ @author Deds Castillo (deds@i-manila.com.ph)
+ @creation-date 2004-10-21
+ @arch-tag: e745b049-e46c-49b2-ae1e-612b5cf08fac
+ @cvs-id $Id: survey.tcl,v 1.2 2005/11/14 04:31:02 daveb Exp $
+} {
+ survey_id:notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+set template_id [survey::report::get_template -survey_id $survey_id]
+
+if {$template_id} {
+ array set template [bcms::item::get_item -item_id $template_id]
+ ad_returnredirect $template(name)
+} else {
+ ad_returnredirect "./"
+}
Index: openacs-4/packages/survey-reports/www/manage/template-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/www/manage/template-add.adp,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/survey-reports/www/manage/template-add.adp 14 Nov 2005 04:31:02 -0000 1.2
@@ -0,0 +1,6 @@
+Variables from these surveys are available in this report
+-
+
- View all users who viewed this report +
- See list of all revisions
++ +- View available page variables (opens in a new window)
+ - View available page variables (opens in a new window)
- Link to this report: @link_to_this_url;noquote@
+
This Version: @template_revision.version_number@
+ +
+Live Version: $template_revision(live_version_number)" + +set link_to_this_url "[ad_url][ad_conn package_url]reports/template?template_id=$item_id" Index: openacs-4/packages/survey-reports/www/manage/template-write.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/www/manage/template-write.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/survey-reports/www/manage/template-write.tcl 14 Nov 2005 04:31:02 -0000 1.2 @@ -0,0 +1,50 @@ +ad_page_contract { + write the template to the file system and set the revision to live +} { + revision_id:notnull,naturalnum + return_url:notnull +} + +set cms_context public + +db_1row get_revision "select cr.*, ci.* from cr_revisions cr, cr_items ci where ci.item_id=cr.item_id and cr.revision_id=:revision_id" -column_array template + +if {[array size template] > 0} { + content::item::set_live_revision -revision_id $revision_id + set template_file "[acs_root_dir]/packages/survey-reports/lib/${template(item_id)}.adp" + set filename_base [ns_mktemp "/tmp/htmlXXXXXX"] + + # TODO DAVEB this should be a tcl proc + # convert unADP to ADP + set content $template(content) + + # regsub legal adp tags from square to angle brackets + foreach tag [list include if else switch case] { + set re "\\\[\s*?${tag}(.*?)\\\]" + set sub "<${tag}\\1>" + regsub -all $re $content $sub content + set re "\\\[/\s*?${tag}\s*?\\\]" + set sub "" + regsub -all $re $content $sub content + } + + set template(content) $content + + template::util::write_file $filename_base $template(content) + set recode_script "[acs_root_dir]/packages/survey/bin/recode" + set demoronise_script "[acs_root_dir]/packages/survey/bin/demoroniser.pl" + if {[catch {exec $demoronise_script $filename_base $template_file} err]} { + ns_log error "template_write Error:'$err'" + # fallback + template::util::write_file $template_file $template(content) + } + file delete $filename_base + +# template::util::write_file $template_file [encoding convertto iso8859-1 $template(content)] +# template::util::write_file $template_file [demoronise $template(content)] +} else { + error "revision does not exist" +} + +ad_returnredirect $return_url +ad_script_abort Index: openacs-4/packages/survey-reports/www/manage/views.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-reports/www/manage/views.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/survey-reports/www/manage/views.adp 14 Nov 2005 04:31:02 -0000 1.2 @@ -0,0 +1,25 @@ +