fixed 'assessment' node 'skipped' column of response table being not …

…optional
campsych · Feb 9, 2024 · a04f609 · a04f609
1 parent 67ccafa
commit a04f609
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 #### Fixes
 
 * SAML logout process now includes nameId
+* fixed *assessment* node *skipped* column of response table being not optional
 
 #### Docker
 

diff --git a/src/Concerto/PanelBundle/Resources/starter_content/export.concerto.yml b/src/Concerto/PanelBundle/Resources/starter_content/export.concerto.yml
@@ -3969,7 +3969,7 @@ collection:
         title: 'next item selector'
         type: 0
         posX: 16127
-        posY: 15096
+        posY: 15095
         flowTest: 7
         sourceTest: 3
         sourceTestName: _eval

diff --git a/...le/Resources/starter_content/src/test/_assessment/nodes/next_item_selector_5/ports/code.r b/...le/Resources/starter_content/src/test/_assessment/nodes/next_item_selector_5/ports/code.r
@@ -102,6 +102,11 @@ getSafePastResponses = function(nextItems, nextItemsIndices) {
     return(pastResponses)
   }
 
+  skippedColumn = responseBank$columns$skipped
+  if(is.null(skippedColumn) || is.na(skippedColumn) || skippedColumn == "") {
+    skippedColumn = "0"
+  }
+
   sql = "
 SELECT 
 {{itemIdColumn}} AS item_id,
@@ -115,7 +120,7 @@ WHERE
   pastResponses = concerto.table.query(sql, list(
     table=responseBank$table,
     responseColumn=responseBank$columns$response,
-    skippedColumn=responseBank$columns$skipped,
+    skippedColumn=skippedColumn,
     sessionIdColumn=responseBank$columns$session_id,
     sessionId=getSessionId(session),
     itemIdColumn=responseBank$columns$item_id,