- Fixed #1069 by adding support for Quantity Max and Min value extens…

…ions.

apps/smart-forms-app/tsconfig.json

@@ -21,7 +21,9 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
-    "forceConsistentCasingInFileNames": true
+    "forceConsistentCasingInFileNames": true,
+    /* Debugging */
+    "sourceMap": true
   },
   "include": ["src", "cypress"],
   "references": [{ "path": "./tsconfig.node.json" }]

packages/smart-forms-renderer/src/hooks/useValidationFeedback.ts

@@ -22,6 +22,10 @@ import {
   getMaxValueFeedback,
   getMinValue,
   getMinValueFeedback,
+  getMinQuantityValue,
+  getMinQuantityValueFeedback,
+  getMaxQuantityValue,
+  getMaxQuantityValueFeedback,
   getRegexValidation
 } from '../utils/itemControl';
 import { structuredDataCapture } from 'fhir-sdc-helpers';
@@ -33,6 +37,8 @@ function useValidationFeedback(qItem: QuestionnaireItem, input: string): string
   const maxDecimalPlaces = structuredDataCapture.getMaxDecimalPlaces(qItem);
   const minValue = getMinValue(qItem);
   const maxValue = getMaxValue(qItem);
+  const minQuantityValue = getMinQuantityValue(qItem);//gets the minQuantity value from the questionaire item
+  const maxQuantityValue = getMaxQuantityValue(qItem);//gets the maxQuantity value from the questionaire item
 
   const invalidType = getInputInvalidType({
     qItem,
@@ -42,12 +48,17 @@ function useValidationFeedback(qItem: QuestionnaireItem, input: string): string
     maxLength,
     maxDecimalPlaces,
     minValue,
-    maxValue
+    maxValue,
+    minQuantityValue,// Min Quantity validation type
+    maxQuantityValue// Max Quantity validation type
   });
 
   if (!invalidType) {
     return '';
   }
+  else {
+    //invalid type exists, so we proceed
+  }
 
   if (invalidType === ValidationResult.regex && regexValidation) {
     return `Input should match the specified regex ${regexValidation.expression}`;
@@ -86,6 +97,22 @@ function useValidationFeedback(qItem: QuestionnaireItem, input: string): string
     return maxValueFeedback ?? `Input exceeds permitted maximum value of ${maxValue}.`;
   }
 
+  //Test min quantity
+  if (
+    invalidType === ValidationResult.minQuantityValue &&
+    (typeof minQuantityValue === 'number')
+  ) {
+    const minQuantityFeedback = getMinQuantityValueFeedback(qItem);//get the feedback for minquantity if it exists
+    return minQuantityFeedback ?? `Input is lower than the expected minimum quantity value of ${minQuantityValue}.`;
+  }
+  //Test max quantity
+  if (
+    invalidType === ValidationResult.maxQuantityValue &&
+    (typeof maxQuantityValue === 'number')
+  ) {
+    const maxQuantityFeedback = getMaxQuantityValueFeedback(qItem);//get the feedback for maxquantity if it exists
+    return maxQuantityFeedback ?? `Input exceeds permitted maximum quantity value of ${maxQuantityValue}.`;
+  }
   return '';
 }
 

packages/smart-forms-renderer/src/utils/itemControl.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import type { Coding, Extension, QuestionnaireItem, QuestionnaireItemAnswerOption } from 'fhir/r4';
+import type { Coding, Extension, Quantity, QuestionnaireItem, QuestionnaireItemAnswerOption } from 'fhir/r4';
 import type { RegexValidation } from '../interfaces/regex.interface';
 import { structuredDataCapture } from 'fhir-sdc-helpers';
 import { default as htmlParse } from 'html-react-parser';
@@ -470,3 +470,106 @@ export function getMaxValueFeedback(qItem: QuestionnaireItem) {
 
   return null;
 }
+
+
+
+
+/**
+ * Check if the item  has a sdc-questionnaire-minQuantity and minQuantity extension
+ * @author Janardhan Vignarajan
+ * @export
+ * @param {QuestionnaireItem} qItem
+ * @return {*}  {(number | undefined)}
+ */
+export function getMinQuantityValue(qItem: QuestionnaireItem) : number | undefined  {
+  const itemControl = qItem.extension?.find(
+    (extension: Extension) =>
+      extension.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-minQuantity'
+  );
+
+  if (itemControl && itemControl.valueQuantity)  { //check if valueQuantity exists in the extension
+    if (itemControl.valueQuantity.value) {//check if valueQuantity.value exists in the extension
+      return itemControl.valueQuantity.value;
+    }
+  }
+  return undefined;
+}
+
+
+/**
+ * Check if the item  has a sdc-questionnaire-minQuantity feedback extension
+ *
+ * @author Janardhan Vignarajan
+ * @export
+ * @param {QuestionnaireItem} qItem
+ * @return {*} 
+ */
+export function getMinQuantityValueFeedback(qItem: QuestionnaireItem) {
+  const itemControl = qItem.extension?.find(
+    (extension: Extension) =>
+      extension.url === 'https://smartforms.csiro.au/ig/StructureDefinition/minQuantityValue-feedback'
+  );
+  if (itemControl) {
+    const extensionString = itemControl.valueString;
+    if (extensionString) {
+      return extensionString;
+    }
+  }
+
+  return null;
+}
+
+
+
+/**
+* Check if the item  has a sdc-questionnaire-maxQuantity  extension
+ *
+ * @author Janardhan Vignarajan
+ * @export
+ * @param {QuestionnaireItem} qItem
+ * @return {*}  {(number | undefined)}
+ */
+export function getMaxQuantityValue(qItem: QuestionnaireItem)  : number | undefined  {
+  const itemControl = qItem.extension?.find(
+    (extension: Extension) =>
+      extension.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-maxQuantity'
+  );
+
+  if (itemControl && itemControl.valueQuantity)  { //check if valueQuantity exists in the extension
+    if (itemControl.valueQuantity.value) {//check if valueQuantity.value exists in the extension
+      return itemControl.valueQuantity.value;
+    }
+  }
+  return undefined;
+}
+
+
+/**
+ * Check if the item  has a sdc-questionnaire-maxQuantity Feedback extension
+ *
+ * @author Janardhan Vignarajan
+ 
+ * @export
+ * @param {QuestionnaireItem} qItem
+ * @return {*} 
+ */
+export function getMaxQuantityValueFeedback(qItem: QuestionnaireItem) {
+  const itemControl = qItem.extension?.find(
+    (extension: Extension) =>
+      extension.url === 'https://smartforms.csiro.au/ig/StructureDefinition/maxQuantityValue-feedback'
+  );
+  if (itemControl) {
+    const extensionString = itemControl.valueString;
+    if (extensionString) {
+      return extensionString;
+    }
+  }
+
+  return null;
+}
+
+
+
+
+
+