moved adding initial answer to confirmations outside loop and changed…

… the testdata
helsenorge · Feb 27, 2024 · fcd6608 · fcd6608
1 parent 9d816eb
commit fcd6608
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/reducers/__tests__/__data__/repeatableBoolean/q.json b/src/reducers/__tests__/__data__/repeatableBoolean/q.json
@@ -51,7 +51,7 @@
             {
               "linkId": "1.0.4",
               "text": "Far",
-              "type": "boolean",
+              "type": "group",
               "repeats": false,
               "item": [
                 { "linkId": "1.0.4.0", "text": "Fullblod", "type": "boolean" },

diff --git a/src/reducers/__tests__/repeatableBoolean-spec.ts b/src/reducers/__tests__/repeatableBoolean-spec.ts
@@ -24,15 +24,17 @@ describe('Given a questionnaire with multiple repeatable booleans', () => {
 
     it('Then repeated item should have an answer with 3 items', () => {
       const repeatedResponseItem = getResponseItem('1.0.4', newState, pathify('1', '1.0^1', '1.0.4')) as QuestionnaireResponseItem;
+      console.log('newState', JSON.stringify(newState, null, 2));
 
+      console.log('repeatedResponseItem', repeatedResponseItem);
       if (!repeatedResponseItem) return fail();
 
       if (!repeatedResponseItem.answer) return fail();
 
       expect(repeatedResponseItem.answer.length).toBe(1);
 
       const answer = repeatedResponseItem.answer[0];
-
+      console.log('answer', answer);
       if (!answer || !answer.item) return fail();
 
       expect(answer.item.length).toBe(3);

diff --git a/src/reducers/__tests__/utils.ts b/src/reducers/__tests__/utils.ts
@@ -167,7 +167,8 @@ function reduce(state: Form, action: NewValueAction): Form {
 }
 
 export function getResponseItem(linkId: string, state: Form, path: Array<Path>): QuestionnaireResponseItem | undefined {
-  if (linkId === path[path.length - 1].linkId) return getResponseItemWithPath(path, state.FormData);
+  const condition = linkId === path[path.length - 1].linkId;
+  if (condition) return getResponseItemWithPath(path, state.FormData);
 }
 
 export function createGlobalStateWithQuestionnaire(q: Questionnaire, qr: QuestionnaireResponse): GlobalState {

diff --git a/src/reducers/form.ts b/src/reducers/form.ts
@@ -255,7 +255,12 @@ function copyItem(
     copyItem(source.item[i], newResponseItem, questionnaireDraft, questionnaire);
   }
   const defItem = getQuestionnaireDefinitionItem(source.linkId, questionnaireDraft.item);
-
+  if (defItem?.type === itemType.BOOLEAN) {
+    const answer = createQuestionnaireResponseAnswer(defItem);
+    if (answer) {
+      target.answer = [answer];
+    }
+  }
   if (defItem && defItem.type !== itemType.ATTATCHMENT) {
     for (let i = 0; source.answer && i < source.answer.length; i++) {
       if (!source.answer[i].item || source.answer[i].item?.length === 0) {
@@ -283,9 +288,7 @@ function copyItem(
       target.answer.push(targetAnswer);
     }
   }
-  if (defItem?.type === itemType.BOOLEAN) {
-    target.answer = addInitialValueToBooleanItem(defItem);
-  }
+
   return target;
 }