@aehrc/smart-forms-renderer 0.23.2 → 0.25.0

package/src/utils/choice.ts

@@ -25,6 +25,23 @@ import type {
 import { ChoiceItemControl, ChoiceItemOrientation } from '../interfaces/choice.enum';
 import { isSpecificItemControl } from './itemControl';
 
+/**
+ * Convert codings to Questionnaire answer options
+ *
+ * @author Sean Fong
+ */
+export function convertCodingsToAnswerOptions(codings: Coding[]): QuestionnaireItemAnswerOption[] {
+  return codings.map(
+    (coding): QuestionnaireItemAnswerOption => ({
+      valueCoding: {
+        system: coding.system,
+        code: coding.code,
+        display: coding.display
+      }
+    })
+  );
+}
+
 /**
  * Find and return corresponding answerOption based on selected answer in form
  *
@@ -32,11 +49,11 @@ import { isSpecificItemControl } from './itemControl';
  */
 export function findInAnswerOptions(
   options: QuestionnaireItemAnswerOption[],
-  str: string
+  valueInString: string
 ): QuestionnaireResponseItemAnswer | undefined {
   for (const option of options) {
     if (option.valueCoding) {
-      if (str === option.valueCoding.code) {
+      if (valueInString === option.valueCoding.code) {
         return {
           valueCoding: option.valueCoding
         };
@@ -44,7 +61,7 @@ export function findInAnswerOptions(
     }
 
     if (option.valueString) {
-      if (str === option.valueString) {
+      if (valueInString === option.valueString) {
         return {
           valueString: option.valueString
         };
@@ -52,7 +69,7 @@ export function findInAnswerOptions(
     }
 
     if (option.valueInteger) {
-      if (str === option.valueInteger.toString()) {
+      if (valueInString === option.valueInteger.toString()) {
         return {
           valueInteger: option.valueInteger
         };
@@ -69,7 +86,6 @@ export function findInAnswerOptions(
  * @author Sean Fong
  */
 export function getChoiceControlType(qItem: QuestionnaireItem) {
-  const dropdownOptionsCount = 5;
   if (isSpecificItemControl(qItem, 'autocomplete')) {
     return ChoiceItemControl.Autocomplete;
   }
@@ -86,17 +102,11 @@ export function getChoiceControlType(qItem: QuestionnaireItem) {
     return ChoiceItemControl.Select;
   }
 
-  if (qItem.answerOption) {
-    return qItem.answerOption.length > 0 && qItem.answerOption.length < dropdownOptionsCount
-      ? ChoiceItemControl.Radio
-      : ChoiceItemControl.Select;
-  } else {
-    return ChoiceItemControl.Select;
-  }
+  return ChoiceItemControl.Select;
 }
 
 /**
- * Find and return corresponding coding from AnswerValyeSet based on selected answer in form
+ * Find and return corresponding coding from AnswerValueSet based on selected answer in form
  *
  * @author Sean Fong
  */

package/src/utils/enableWhen.ts

@@ -68,51 +68,73 @@ export function isEnabledAnswerTypeSwitcher(
   enableWhen: QuestionnaireItemEnableWhen,
   answer: QuestionnaireResponseItemAnswer
 ): boolean {
-  if (enableWhen['answerBoolean'] !== undefined && enableWhen.operator === 'exists') {
+  if (typeof enableWhen.answerBoolean === 'boolean' && enableWhen.operator === 'exists') {
     return answerOperatorSwitcher(enableWhen.answerBoolean, answer, enableWhen.operator);
-  } else if (enableWhen['answerBoolean'] !== undefined && answer.valueBoolean !== undefined) {
+  }
+
+  if (typeof enableWhen.answerBoolean === 'boolean' && typeof answer.valueBoolean === 'boolean') {
     return answerOperatorSwitcher(
       enableWhen.answerBoolean,
       answer.valueBoolean,
       enableWhen.operator
     );
-  } else if (enableWhen['answerDecimal'] && answer.valueDecimal) {
+  }
+
+  if (typeof enableWhen.answerDecimal === 'number' && typeof answer.valueDecimal === 'number') {
     return answerOperatorSwitcher(
       enableWhen.answerDecimal,
       answer.valueDecimal,
       enableWhen.operator
     );
-  } else if (enableWhen['answerInteger'] !== undefined && answer.valueInteger !== undefined) {
+  }
+
+  if (typeof enableWhen.answerInteger === 'number' && typeof answer.valueInteger === 'number') {
     return answerOperatorSwitcher(
       enableWhen.answerInteger,
       answer.valueInteger,
       enableWhen.operator
     );
-  } else if (enableWhen['answerDate'] && answer.valueDate) {
+  }
+
+  if (typeof enableWhen.answerDate === 'string' && typeof answer.valueDate === 'string') {
     return answerOperatorSwitcher(enableWhen.answerDate, answer.valueDate, enableWhen.operator);
-  } else if (enableWhen['answerDateTime'] && answer.valueDateTime) {
+  }
+
+  if (typeof enableWhen.answerDateTime === 'string' && typeof answer.valueDateTime === 'string') {
     return answerOperatorSwitcher(
       enableWhen.answerDateTime,
       answer.valueDateTime,
       enableWhen.operator
     );
-  } else if (enableWhen['answerTime'] && answer.valueTime) {
+  }
+
+  if (typeof enableWhen.answerTime === 'string' && typeof answer.valueTime === 'string') {
     return answerOperatorSwitcher(enableWhen.answerTime, answer.valueTime, enableWhen.operator);
-  } else if (enableWhen['answerString'] && answer.valueString) {
+  }
+
+  if (typeof enableWhen.answerString === 'string' && typeof answer.valueString === 'string') {
     return answerOperatorSwitcher(enableWhen.answerString, answer.valueString, enableWhen.operator);
-  } else if (enableWhen['answerCoding']?.code && answer.valueCoding?.code) {
+  }
+
+  if (
+    typeof enableWhen.answerCoding?.code === 'string' &&
+    typeof answer.valueCoding?.code === 'string'
+  ) {
     return answerOperatorSwitcher(
       enableWhen.answerCoding.code,
       answer.valueCoding.code,
       enableWhen.operator
     );
-  } else if (enableWhen['answerQuantity'] && answer.valueQuantity) {
+  }
+
+  if (enableWhen.answerQuantity && answer.valueQuantity) {
     return answerOperatorSwitcher(
       enableWhen.answerQuantity,
       answer.valueQuantity,
       enableWhen.operator
     );
   }
+
   return false;
 }
 

package/src/utils/initialise.ts

@@ -73,6 +73,13 @@ export function initialiseQuestionnaireResponse(
     questionnaireResponse.questionnaire = createQuestionnaireReference(questionnaire);
   }
 
+  // Add "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse" profile
+  const profiles: string[] = [
+    'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse'
+  ];
+  questionnaireResponse.meta = questionnaireResponse.meta || {};
+  questionnaireResponse.meta.profile = profiles;
+
   return questionnaireResponse;
 }