wip: allow submission of incompletely answered selection questions

uzh-bf · Jan 14, 2025 · 5909a65 · 5909a65
1 parent 3a74b12
commit 5909a65
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 22 deletions.
diff --git a/apps/frontend-pwa/src/components/groupActivity/GroupActivityStack.tsx b/apps/frontend-pwa/src/components/groupActivity/GroupActivityStack.tsx
@@ -287,7 +287,10 @@ function GroupActivityStack({
                         type: ElementType.Selection,
                         selectionResponse: Object.values(
                           value.response!
-                        ).filter((entry) => typeof entry !== 'undefined'),
+                        ).filter(
+                          (entry) =>
+                            typeof entry !== 'undefined' && entry !== -1
+                        ),
                       }
                     } else {
                       return {

diff --git a/apps/func-response-processor/src/index.ts b/apps/func-response-processor/src/index.ts
@@ -361,14 +361,19 @@ const serviceBusTrigger = async function (
       }
       case 'SELECTION': {
         response.selection.forEach((answerId: number) => {
+          // skipped input fields should not be considered
+          if (answerId === -1) {
+            return
+          }
+
           redisMulti.hincrby(`${instanceKey}:results`, String(answerId), 1)
         })
         redisMulti.hincrby(`${instanceKey}:results`, 'participants', 1)
 
         if (participantData) {
           const pointsPercentage = gradeQuestionSelection({
             numberOfInputs: parseInt(instanceInfo.numberOfInputs),
-            response: response.selection,
+            response: response.selection.filter((r: number) => r !== -1), // filter out skipped response fields
             correctAnswers: parsedSolutions,
           })
 
@@ -408,7 +413,7 @@ const serviceBusTrigger = async function (
           redisMulti.hset(
             `${instanceKey}:responses`,
             participantData.sub,
-            response.selection
+            response.selection.filter((r: number) => r !== -1) // filter out skipped response fields
           )
           redisMulti.hincrby(
             `${sessionKey}:b:${sessionBlockId}:lb`,

diff --git a/packages/graphql/src/services/stacks.ts b/packages/graphql/src/services/stacks.ts
@@ -2791,7 +2791,9 @@ async function respondToElement({
       {
         courseId: courseId,
         id: response.instanceId,
-        response: { selection: response.selectionResponse },
+        response: {
+          selection: response.selectionResponse?.filter((r) => r !== -1), // only forward valid responses
+        },
         answerTime,
         participation,
         skipTracking,

diff --git a/packages/shared-components/src/StudentElement.tsx b/packages/shared-components/src/StudentElement.tsx
@@ -51,7 +51,7 @@ export type InstanceStackStudentResponseType =
     }
   | {
       type: ElementType.Selection
-      response?: Record<number, number | undefined>
+      response?: Record<number, number>
       valid?: boolean
       evaluation?: InstanceEvaluation
     }
@@ -290,14 +290,8 @@ function StudentElement({
         options={element.elementData.options}
         response={
           typeof studentResponse !== 'undefined'
-            ? (studentResponse[element.id]?.response as Record<
-                number,
-                number | undefined
-              >)
-            : (singleStudentResponse.response as Record<
-                number,
-                number | undefined
-              >)
+            ? (studentResponse[element.id]?.response as Record<number, number>)
+            : (singleStudentResponse.response as Record<number, number>)
         }
         valid={
           typeof studentResponse !== 'undefined'

diff --git a/packages/shared-components/src/questions/SELECTIONAnswerOptions.tsx b/packages/shared-components/src/questions/SELECTIONAnswerOptions.tsx
@@ -6,8 +6,8 @@ import Select from 'react-select'
 import { twMerge } from 'tailwind-merge'
 
 interface SELECTIONAnswerOptionsProps {
-  responses: Record<number, number | undefined>
-  onChange: (newValue: Record<number, number | undefined>) => void
+  responses: Record<number, number>
+  onChange: (newValue: Record<number, number>) => void
   options: SelectionQuestionOptions
   elementIx: number
   disabled: boolean
@@ -24,9 +24,9 @@ function SELECTIONAnswerOptions({
 }: SELECTIONAnswerOptionsProps) {
   const t = useTranslations()
 
-  // get the selected options, which are not undefined
+  // get the selected options, which are not unselected
   const selectedValues = Object.values(responses).filter(
-    (selectedValue) => selectedValue !== undefined
+    (selectedValue) => selectedValue !== -1
   )
 
   // compute selection options for the select field
@@ -82,7 +82,7 @@ function SELECTIONAnswerOptions({
                 instanceId={`selection-${elementIx + 1}-field-${Number(inputIndex) + 1}`}
                 isDisabled={disabled}
                 value={
-                  selectedValue
+                  typeof selectedValue !== 'undefined' && selectedValue !== -1
                     ? { label: selectedLabel, value: selectedValue }
                     : undefined
                 }

diff --git a/packages/shared-components/src/utils/validateResponse.ts b/packages/shared-components/src/utils/validateResponse.ts
@@ -87,13 +87,14 @@ export function validateFreeTextResponse({
 export function validateSelectionResponse({
   response,
 }: {
-  response?: Record<number, number | undefined>
+  response?: Record<number, number>
 }) {
-  // ensure that all select components contain a submission value and that all values are unique
+  // ensure that at least one option is selected and that selected answer options are unique
   if (
     !response ||
-    Object.values(response).some((value) => typeof value === 'undefined') ||
-    new Set(Object.values(response)).size !== Object.values(response).length
+    Object.values(response).every((value) => value === -1) ||
+    new Set(Object.values(response).filter((r) => r !== -1)).size !==
+      Object.values(response).filter((r) => r !== -1).length
   ) {
     return false
   }