feat: changes for questionnaire support

nepware-dev · Aug 28, 2023 · 8df66ca · 8df66ca
1 parent 9ddc2c4
commit 8df66ca
Show file tree

Hide file tree

Showing 93 changed files with 795 additions and 391 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,5 @@
 yarn run lint-staged
 
 yarn extract
+yarn compile
 git add shared/src/locale
diff --git a/shared/src/hooks/questionnaire-response-form-data.ts b/shared/src/hooks/questionnaire-response-form-data.ts
@@ -1,8 +1,3 @@
-import { useService } from 'fhir-react/lib/hooks/service';
-import { isFailure, isSuccess, RemoteDataResult, success } from 'fhir-react/lib/libs/remoteData';
-import { getReference, saveFHIRResource } from 'fhir-react/lib/services/fhir';
-import { mapSuccess, service } from 'fhir-react/lib/services/service';
-import { formatFHIRDateTime } from 'fhir-react/lib/utils/date';
 import {
     QuestionnaireResponse as FHIRQuestionnaireResponse,
     Patient,
@@ -19,6 +14,12 @@ import {
     removeDisabledAnswers,
 } from 'sdc-qrf';
 
+import { useService } from 'fhir-react/lib/hooks/service';
+import { isFailure, isSuccess, RemoteDataResult, success } from 'fhir-react/lib/libs/remoteData';
+import { getReference, saveFHIRResource } from 'fhir-react/lib/services/fhir';
+import { mapSuccess, service } from 'fhir-react/lib/services/service';
+import { formatFHIRDateTime } from 'fhir-react/lib/utils/date';
+
 import {
     QuestionnaireResponse as FCEQuestionnaireResponse,
     ParametersParameter as FCEParametersParameter,
@@ -137,7 +138,7 @@ export async function loadQuestionnaireResponseFormData(props: QuestionnaireResp
         if (questionnaireLoader.type === 'id') {
             return service<FHIRQuestionnaire>({
                 method: 'GET',
-                url: `/Questionnaire/${questionnaireLoader.questionnaireId}/$assemble`,
+                url: `/Questionnaire/${questionnaireLoader.questionnaireId}`,
             });
         }
 
@@ -199,23 +200,24 @@ export async function handleFormDataSave(
     };
     const finalFHIRQuestionnaireResponse: FHIRQuestionnaireResponse =
         fromFirstClassExtension(finalFCEQuestionnaireResponse);
+
     const fhirQuestionnaire: FHIRQuestionnaire = fromFirstClassExtension(questionnaire);
 
-    const constraintRemoteData = await service({
-        url: '/QuestionnaireResponse/$constraint-check',
-        method: 'POST',
-        data: {
-            resourceType: 'Parameters',
-            parameter: [
-                { name: 'Questionnaire', resource: fhirQuestionnaire },
-                { name: 'QuestionnaireResponse', resource: finalFHIRQuestionnaireResponse },
-                ...(launchContextParameters || []),
-            ],
-        },
-    });
-    if (isFailure(constraintRemoteData)) {
-        return constraintRemoteData;
-    }
+    // const constraintRemoteData = await service({
+    //     url: '/QuestionnaireResponse/$constraint-check',
+    //     method: 'POST',
+    //     data: {
+    //         resourceType: 'Parameters',
+    //         parameter: [
+    //             { name: 'Questionnaire', resource: fhirQuestionnaire },
+    //             { name: 'QuestionnaireResponse', resource: finalFHIRQuestionnaireResponse },
+    //             ...(launchContextParameters || []),
+    //         ],
+    //     },
+    // });
+    // if (isFailure(constraintRemoteData)) {
+    //     return constraintRemoteData;
+    // }
 
     const saveQRRemoteData = await questionnaireResponseSaveService(finalFHIRQuestionnaireResponse);
     if (isFailure(saveQRRemoteData)) {