Merge branch 'release/0.9.0'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fhirformjs",
   "description": "FHIR Questionnaire To Form Converter for rendering",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

src/ques-mapper.ts

@@ -13,6 +13,7 @@ export const FhirJsonForm = (
   fhirQuestionnaire: R4.IQuestionnaire
 ): FhirForm => {
   let ALL_PROPERTIES: any = {};
+  let requiredProperties: string[] = [];
   let UISchema: any = {};
 
   let fhirQuestionnaireResponse: R4.IQuestionnaireResponse = {
@@ -53,21 +54,35 @@ export const FhirJsonForm = (
           myProperty
         ] = GetItemProperties(groupItem);
 
+        if (groupItem.required) {
+          if (ALL_PROPERTIES[groupProperty]['required'] === undefined) {
+            ALL_PROPERTIES[groupProperty]['required'] = []
+          }
+          ALL_PROPERTIES[groupProperty]['required'].push(myProperty)
+        }
+
         if (GetWidget(groupItem) !== '') {
           UISchema[groupProperty][myProperty] = {
             'ui:widget': GetWidget(groupItem),
           };
         }
 
-        if (GetUIOptions(groupItem) !== '') {
+        const uiOptions = GetUIOptions(groupItem)
+        if (uiOptions !== '') {
           UISchema[groupProperty][myProperty] = {
-            'ui:options': GetUIOptions(groupItem),
+            'ui:options': uiOptions,
           };
+
+          if (uiOptions.unit) {
+            UISchema[groupProperty][myProperty]['ui:placeholder'] = uiOptions.unit
+          }
         }
 
         fhirQuestionnaireResponse.item?.push(CreateResponseItem(groupItem));
       });
 
+      item.required && requiredProperties.push(groupProperty)
+
       // Just push the fields if not a group
     } else {
       let myProperty =
@@ -88,13 +103,16 @@ export const FhirJsonForm = (
       }
 
       fhirQuestionnaireResponse.item?.push(CreateResponseItem(item));
+
+      item.required && requiredProperties.push(myProperty)
     }
   });
 
   let fhirJsonSchema: FhirJsonSchema = {
     type: 'object',
     title: fhirQuestionnaire.id?.toString(),
     properties: ALL_PROPERTIES,
+    required: requiredProperties,
   };
   let fhirForm: FhirForm = {
     model: fhirQuestionnaireResponse,
@@ -244,9 +262,19 @@ const GetControlType = (item: R4.IQuestionnaire_Item) => {
       return 'array'
     }
   }
+
   if (item.type === R4.Questionnaire_ItemTypeKind._boolean) {
     return 'boolean';
   }
+
+  if (item.type == R4.Questionnaire_ItemTypeKind._decimal) {
+    return 'number';
+  }
+
+  if (item.type == R4.Questionnaire_ItemTypeKind._integer) {
+    return 'integer';
+  }
+
   return 'string';
 };
 
@@ -288,7 +316,7 @@ const CreateResponseItem = (item: R4.IQuestionnaire_Item) => {
     case R4.Questionnaire_ItemTypeKind._openChoice:
       const option = (item.answerOption || [])[0]
       ans[key] = Object
-        .keys(option.valueCoding || {})
+        .keys(option?.valueCoding || {})
         .reduce((acc, prop) => ({...acc, [prop]: ''}), {})
       break;
 

src/schema.ts

@@ -2,4 +2,5 @@ export default interface FhirJsonSchema {
   type?: string;
   title?: string;
   properties?: any;
+  required?: string[];
 }