Change default for T_REPORTING_MARK_OPTIONAL_NO_ANSWER_WITH and add t…

…o start and develop scripts
Tangerine-Community · Jul 28, 2023 · 01f5af4 · 01f5af4
1 parent d3a2b66
commit 01f5af4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/config.defaults.sh b/config.defaults.sh
@@ -112,13 +112,13 @@ T_ORIENTATION="any"
 T_HIDE_SKIP_IF="true"
 
 # In outputs, set cell value to this when something is skipped due to skip logic.
-T_REPORTING_MARK_SKIPPED_WITH="999"
+T_REPORTING_MARK_SKIPPED_WITH="SKIPPED"
 
 # In outputs, set cell value to this when something is optional and not answered.
-T_REPORTING_MARK_OPTIONAL_NO_ANSWER_WITH="888"
+T_REPORTING_MARK_OPTIONAL_NO_ANSWER_WITH="SKIPPED"
 
 # In outputs, set cell value to this when something is disabled or hidden. Set to "ORIGINAL_VALUE" if you want the actual value stored.
-T_REPORTING_MARK_HIDDEN_WITH="ORIGINAL_VALUE"
+T_REPORTING_MARK_DISABLED_OR_HIDDEN_WITH="ORIGINAL_VALUE"
 
 # In outputs, set cell value to this when something is undefined. Set to "ORIGINAL_VALUE" if you want the actual value stored.
 T_REPORTING_MARK_UNDEFINED_WITH="UNDEFINED"

diff --git a/develop-M1.sh b/develop-M1.sh
@@ -190,6 +190,7 @@ OPTIONS="--link $T_COUCHDB_CONTAINER_NAME:couchdb \
   --env \"T_CENTRALLY_MANAGED_USER_PROFILE=$T_CENTRALLY_MANAGED_USER_PROFILE\" \
   --env \"T_CATEGORIES=$T_CATEGORIES\" \
   --env \"T_ORIENTATION=$T_ORIENTATION\" \
+  --env \"T_REPORTING_MARK_OPTIONAL_NO_ANSWER_WITH=$T_REPORTING_MARK_OPTIONAL_NO_ANSWER_WITH\" \
   --env \"T_REPORTING_MARK_DISABLED_OR_HIDDEN_WITH=$T_REPORTING_MARK_DISABLED_OR_HIDDEN_WITH\" \
   --env \"T_REPORTING_MARK_SKIPPED_WITH=$T_REPORTING_MARK_SKIPPED_WITH\" \
   --env \"T_REPORTING_MARK_UNDEFINED_WITH=$T_REPORTING_MARK_UNDEFINED_WITH\" \

diff --git a/develop.sh b/develop.sh
@@ -186,6 +186,7 @@ OPTIONS="--link $T_COUCHDB_CONTAINER_NAME:couchdb \
   --env \"T_CENTRALLY_MANAGED_USER_PROFILE=$T_CENTRALLY_MANAGED_USER_PROFILE\" \
   --env \"T_CATEGORIES=$T_CATEGORIES\" \
   --env \"T_ORIENTATION=$T_ORIENTATION\" \
+  --env \"T_REPORTING_MARK_OPTIONAL_NO_ANSWER_WITH=$T_REPORTING_MARK_OPTIONAL_NO_ANSWER_WITH\" \
   --env \"T_REPORTING_MARK_DISABLED_OR_HIDDEN_WITH=$T_REPORTING_MARK_DISABLED_OR_HIDDEN_WITH\" \
   --env \"T_REPORTING_MARK_SKIPPED_WITH=$T_REPORTING_MARK_SKIPPED_WITH\" \
   --env \"T_REPORTING_MARK_UNDEFINED_WITH=$T_REPORTING_MARK_UNDEFINED_WITH\" \

diff --git a/server/src/modules/csv/index.js b/server/src/modules/csv/index.js
@@ -397,7 +397,7 @@ const  generateFlatResponse = async function (formResponse, locationList, saniti
           tangyModules.setVariable(flatFormResponse, input, `${formID}.${item.id}.${input.name}.number_of_items_attempted`, numberOfItemsAttempted)
           tangyModules.setVariable(flatFormResponse, input, `${formID}.${item.id}.${input.name}.gridAutoStopped`, input.gridAutoStopped)
           tangyModules.setVariable(flatFormResponse, input, `${formID}.${item.id}.${input.name}.autoStop`, input.autoStop)
-        } else if (input.tagName === 'TANGY-BOX' || input.name === '') {
+        } else if (input.tagName === 'TANGY-BOX' || (input.tagName === 'TANGY-TEMPLATE' && input.value === undefined) || input.name === '') {
           // Do nothing :).
         } else if (input && typeof input.value === 'string') {
           tangyModules.setVariable(flatFormResponse, input, `${formID}.${item.id}.${input.name}`, input.value)

diff --git a/server/src/modules/mysql-js/index.js b/server/src/modules/mysql-js/index.js
@@ -362,6 +362,8 @@ const generateFlatResponse = async function (formResponse, locationList, sanitiz
           tangyModules.setVariable(flatFormResponse, input, `${firstIdSegment}${input.name}`, input.value ? 'true' : 'false')
         } else if (input.tagName === 'TANGY-VIDEO-CAPTURE') {
           tangyModules.setVariable(flatFormResponse, input, `${firstIdSegment}${input.name}`, input.value ? 'true' : 'false')
+        } else if (input.tagName === 'TANGY-BOX' || (input.tagName === 'TANGY-TEMPLATE' && input.value === undefined) || input.name === '') {
+          // Do nothing :).
         } else if (input.tagName === 'TANGY-SIGNATURE') {
           tangyModules.setVariable(flatFormResponse, input, `${firstIdSegment}${input.name}`, input.value ? 'true' : 'false')
         } else if (input && typeof input.value === 'string') {

diff --git a/start.sh b/start.sh
@@ -192,6 +192,7 @@ RUN_OPTIONS="
   --env \"T_CENTRALLY_MANAGED_USER_PROFILE=$T_CENTRALLY_MANAGED_USER_PROFILE\" \
   --env \"T_ORIENTATION=$T_ORIENTATION\" \
   --env \"T_REPORTING_MARK_DISABLED_OR_HIDDEN_WITH=$T_REPORTING_MARK_DISABLED_OR_HIDDEN_WITH\" \
+  --env \"T_REPORTING_MARK_OPTIONAL_NO_ANSWER_WITH=$T_REPORTING_MARK_OPTIONAL_NO_ANSWER_WITH\" \
   --env \"T_REPORTING_MARK_SKIPPED_WITH=$T_REPORTING_MARK_SKIPPED_WITH\" \
   --env \"T_REPORTING_MARK_UNDEFINED_WITH=$T_REPORTING_MARK_UNDEFINED_WITH\" \
   --env \"T_HIDE_SKIP_IF=$T_HIDE_SKIP_IF\" \