Index: openacs-4/packages/assessment/assessment.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v
diff -u -r1.57.2.3 -r1.57.2.4
--- openacs-4/packages/assessment/assessment.info 2 Jul 2019 08:05:32 -0000 1.57.2.3
+++ openacs-4/packages/assessment/assessment.info 21 Nov 2019 18:54:20 -0000 1.57.2.4
@@ -7,7 +7,7 @@
f
f
-
+
Eduardo Perez Ureta
Assessment package that will replace the surveys
quizz, complex survey, poll and other data collection packages
@@ -18,7 +18,7 @@
2
#assessment.Assessment#
-
+
Index: openacs-4/packages/assessment/lib/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/assessment.tcl,v
diff -u -r1.33.2.2 -r1.33.2.3
--- openacs-4/packages/assessment/lib/assessment.tcl 17 Aug 2019 09:29:28 -0000 1.33.2.2
+++ openacs-4/packages/assessment/lib/assessment.tcl 21 Nov 2019 18:54:20 -0000 1.33.2.3
@@ -360,7 +360,7 @@
if {$presentation_type in {rbo sbo cbo}} {
lappend validate_list "response_to_item.$as_item_id {\$\{response_to_item.$as_item_id\} ne \"\" || \[ns_queryget response_to_item.${as_item_id}\.text\] ne \"\"} \"\[_ assessment.form_element_required\]\""
} else {
- lappend validate_list "response_to_item.$as_item_id {\[exists_and_not_null response_to_item($as_item_id)\]} \"\[_ assessment.form_element_required\]\""
+ lappend validate_list "response_to_item.$as_item_id {\[info exists response_to_item($as_item_id)\] && \$response_to_item($as_item_id) ne \"\"} \"\[_ assessment.form_element_required\]\""
}
incr required_count
}
@@ -393,9 +393,9 @@
if {$required_p == "t"} {
# make sure that mandatory items are answered
if {$presentation_type in {rbo sbo cbo}} {
- lappend validate_list "response_to_item.$as_item_id {\[exists_and_not_null response_to_item($as_item_id)\] || \[exists_and_not_null response_to_item($as_item_id)\.text\]} \"\[_ assessment.form_element_required\]\""
+ lappend validate_list "response_to_item.$as_item_id {\[info exists response_to_item($as_item_id)\] && \$response_to_item($as_item_id) ne \"\" || {\[info exists response_to_item($as_item_id)\.text\] && \$response_to_item($as_item_id)\.text ne \"\"} \"\[_ assessment.form_element_required\]\""
} else {
- lappend validate_list "response_to_item.$as_item_id {\[exists_and_not_null response_to_item($as_item_id)\]} \"\[_ assessment.form_element_required\]\""
+ lappend validate_list "response_to_item.$as_item_id {\[info exists response_to_item($as_item_id)\] && \$response_to_item($as_item_id) ne \"\"} \"\[_ assessment.form_element_required\]\""
}
incr required_count
}
Index: openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql,v
diff -u -r1.9 -r1.9.4.1
--- openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql 27 Oct 2014 16:40:55 -0000 1.9
+++ openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql 21 Nov 2019 18:54:20 -0000 1.9.4.1
@@ -181,7 +181,7 @@
name => 'Add to Community',
description => 'Add user to a community',
tcl_code => 'set user_id [ad_conn user_id]
-if { [exists_and_not_null subject_id] } {
+if { [info exists subject_id] && $subject_id ne "" } {
set user_id $subject_id
}
dotlrn_privacy::set_user_guest_p -user_id $user_id -value "t"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/sql/oracle/upgrade/upgrade-2.10.0d4-2.10.0d5.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql 12 Jul 2018 09:00:13 -0000 1.16
+++ openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql 21 Nov 2019 18:54:20 -0000 1.16.2.1
@@ -240,7 +240,7 @@
'Add to Community',
'Add user to a community',
'set user_id [ad_conn user_id]
-if { [exists_and_not_null subject_id] } {
+if { [info exists subject_id] && $subject_id ne "" } {
set user_id $subject_id
}
dotlrn_privacy::set_user_guest_p -user_id $user_id -value "t"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-2.10.0d4-2.10.0d5.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/assessment/www/asm-admin/results-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-export.tcl,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/assessment/www/asm-admin/results-export.tcl 29 Jun 2018 17:27:18 -0000 1.17
+++ openacs-4/packages/assessment/www/asm-admin/results-export.tcl 21 Nov 2019 18:54:20 -0000 1.17.2.1
@@ -113,15 +113,15 @@
if {$mc_item_list ne ""} {
db_foreach mc_items {} {
if {$text_value eq ""} {
- if {[exists_and_not_null csv_${section_id}_${as_item_id}($session_id)]} {
+ if {[info exists csv_${section_id}_${as_item_id}($session_id)] && [set csv_${section_id}_${as_item_id}($session_id)] ne ""} {
# append list of choices separated with comma
append csv_${section_id}_${as_item_id}($session_id) ",[as::assessment::quote_export -text $title]"
} else {
# just set the choice value
set csv_${section_id}_${as_item_id}($session_id) [as::assessment::quote_export -text $title]
}
} else {
- if {[exists_and_not_null csv_${section_id}_${as_item_id}($session_id)]} {
+ if {[info exists csv_${section_id}_${as_item_id}($session_id)] && [set csv_${section_id}_${as_item_id}($session_id)] ne ""} {
append csv_${section_id}_${as_item_id}($session_id) ",[as::assessment::quote_export -text $text_value]"
} else {
set csv_${section_id}_${as_item_id}($session_id) [as::assessment::quote_export -text $text_value]
@@ -140,7 +140,7 @@
foreach session_id $session_list {
foreach {section_id item_id} $item_list {
- if {[exists_and_not_null csv_${section_id}_${item_id}($session_id)]} {
+ if {[info exists csv_${section_id}_${item_id}($session_id)] && [set csv_${section_id}_${item_id}($session_id)] ne ""} {
lappend csv_result_list($session_id) "\"[set csv_${section_id}_${item_id}($session_id)]\""
} else {
lappend csv_result_list($session_id) ""