formbuilder-lhcforms 11.0.15 → 11.2.2

package/dist/formbuilder-lhcforms/assets/fhir-definitions.schema.json5

@@ -430,38 +430,6 @@
                 },
                 "additionalProperties": false,
                 "type": "object",
-                "widget": {
-                  "id": "row-layout"
-                },
-                "fieldsets": [
-                  {
-                    "fields": [
-                      "id",
-                      "system",
-                      "version",
-                      "code",
-                      "display",
-                      "userSelected"
-                    ],
-                    "showFields": [
-                      {
-                        "code": {
-                          "col": 2
-                        }
-                      },
-                      {
-                        "system": {
-                          "col": 6
-                        }
-                      },
-                      {
-                        "display": {
-                          "col": 4
-                        }
-                      }
-                    ]
-                  }
-                ]
               },
               "type": "array"
             },
@@ -516,38 +484,6 @@
           },
           "additionalProperties": false,
           "type": "object",
-          "widget": {
-            "id": "row-layout"
-          },
-          "fieldsets": [
-            {
-              "fields": [
-                "id",
-                "system",
-                "version",
-                "code",
-                "display",
-                "userSelected"
-              ],
-              "showFields": [
-                {
-                  "code": {
-                    "col": 2
-                  }
-                },
-                {
-                  "system": {
-                    "col": 6
-                  }
-                },
-                {
-                  "display": {
-                    "col": 4
-                  }
-                }
-              ]
-            }
-          ]
         },
         "valueContactPoint": {
           "description": "Value of extension - must be one of a constrained set of the data types (see [Extensibility](extensibility.html) for a list).",
@@ -895,9 +831,6 @@
                     },
                     "additionalProperties": false,
                     "type": "object",
-                    "widget": {
-                      "id": "row-layout"
-                    },
                     "fieldsets": [
                       {
                         "fields": [
@@ -1446,9 +1379,6 @@
                 },
                 "additionalProperties": false,
                 "type": "object",
-                "widget": {
-                  "id": "row-layout"
-                },
                 "fieldsets": [
                   {
                     "fields": [
@@ -1790,11 +1720,12 @@
             "language": {
               "description": "The media type of the language for the expression.",
               "enum": [
-                "text/cql",
                 "text/fhirpath",
+                "text/cql",
                 "application/x-fhir-query"
               ],
-              "type": "string"
+              "type": "string",
+              "default": "text/fhirpath"
             },
             "expression": {
               "description": "An expression in the specified language that returns a value.",
@@ -2020,9 +1951,6 @@
               },
               "additionalProperties": false,
               "type": "object",
-              "widget": {
-                "id": "row-layout"
-              },
               "fieldsets": [
                 {
                   "fields": [
@@ -2105,9 +2033,6 @@
                     },
                     "additionalProperties": false,
                     "type": "object",
-                    "widget": {
-                      "id": "row-layout"
-                    },
                     "fieldsets": [
                       {
                         "fields": [
@@ -2395,9 +2320,6 @@
                 },
                 "additionalProperties": false,
                 "type": "object",
-                "widget": {
-                  "id": "row-layout"
-                },
                 "fieldsets": [
                   {
                     "fields": [
@@ -2473,9 +2395,6 @@
                 },
                 "additionalProperties": false,
                 "type": "object",
-                "widget": {
-                  "id": "row-layout"
-                },
                 "fieldsets": [
                   {
                     "fields": [
@@ -2511,13 +2430,171 @@
           },
           "additionalProperties": false,
           "type": "object"
+        },
+        "__$isValueX": {
+          // Boolean to identify valueX/extension
+          "description": "Use one of the value types or an extension - must be one of a constrained set of the data types (see [Extensibility](extensibility.html) for a list).",
+          "type": "boolean",
+          "default": true,
+          "widget": {
+            "id": "boolean-radio",
+            "optionLabels": [
+              [
+                true,
+                "Use a value type"
+              ],
+              [
+                false,
+                "Use an extension"
+              ]
+            ],
+            "labelClasses": "col-2 ps-0 pe-1",
+            "controlClasses": "col-auto btn-group btn-group-sm ps-0"
+          }
+        },
+        "__$valueTypeCategory": {
+          // Identify category.
+          "description": "The category of the value in this extension. This is used to determine how to interpret the value.",
+          "enum": [
+            "__$valueTypePrimitive",
+            "__$valueGeneralPurposeDatatype",
+            "__$valueMetadataType",
+            "__$valueSpecialPurposeDatatype",
+          ],
+          "title": "Pick a data type category",
+          "type": "string",
+          "default": "__$valueTypePrimitive",
+          "visibleIf": {
+            "__$isValueX": [true]
+          },
+        },
+        "__$valueTypePrimitive": {
+          // Enumerate primitive types
+          "description": "The primitive datatype of the value in this extension. This is used to determine how to interpret the value.",
+          "enum": [
+            "valueBase64Binary",
+            "valueBoolean",
+            "valueCanonical",
+            "valueCode",
+            "valueDate",
+            "valueDateTime",
+            "valueDecimal",
+            "valueId",
+            "valueInstant",
+            "valueInteger",
+            "valueMarkdown",
+            "valueOid",
+            "valuePositiveInt",
+            "valueString",
+            "valueTime",
+            "valueUnsignedInt",
+            "valueUri",
+            "valueUrl",
+            "valueUuid",
+          ],
+          "type": "string",
+          "default": "valueString",
+          "visibleIf": {
+            "__$valueTypeCategory": ["__$valueTypePrimitive"]
+          },
+          "widget": {
+            "id": "select",
+          }
+        },
+        "__$valueGeneralPurposeDatatype": {
+          // Enumerate general purpose types.
+          "description": "The general purpose datatype of the value in this extension. This is used to determine how to interpret the value.",
+          "enum": [
+            "valueAddress",
+            "valueAge",
+            "valueAnnotation",
+            "valueAttachment",
+            "valueCodeableConcept",
+            "valueCoding",
+            "valueContactPoint",
+            "valueCount",
+            "valueDistance",
+            "valueDuration",
+            "valueHumanName",
+            "valueIdentifier",
+            "valueMoney",
+            "valuePeriod",
+            "valueQuantity",
+            "valueRange",
+            "valueRatio",
+          ],
+          "type": "string",
+          "default": "valueAddress",
+          "visibleIf": {
+            "__$valueTypeCategory": ["__$valueGeneralPurposeDatatype"]
+          },
+          "widget": {
+            "id": "select",
+          }
+        },
+        "__$valueMetadataType": {
+          // Enumerate meta data types.
+          "description": "The metadata type of the value in this extension. This is used to determine how to interpret the value.",
+          "enum": [
+            "valueContactDetail",
+            "valueContributor",
+            "valueExpression",
+            "valueParameterDefinition",
+            "valueRelatedArtifact",
+            "valueSampledData",
+            "valueSignature",
+            "valueUsageContext",
+          ],
+          "type": "string",
+          "default": "valueContactDetail",
+          "visibleIf": {
+            "__$valueTypeCategory": ["__$valueMetadataType"]
+          },
+          "widget": {
+            "id": "select",
+          }
+        },
+        "__$valueSpecialPurposeDatatype": {
+          // Enumerate special purpose types.
+          "description": "The special purpose datatype of the value in this extension. This is used to determine how to interpret the value.",
+          "enum": [
+            "valueMeta",
+            "valueReference",
+          ],
+          "type": "string",
+          "default": "valueReference",
+          "visibleIf": {
+            "__$valueTypeCategory": ["__$valueSpecialPurposeDatatype"]
+          },
+          "widget": {
+            "id": "select",
+          }
+        },
+        "__$valueType": {
+          // Actual type used. i.e. one of valueX or 'extension'.
+          "title": "Type",
+          "description": "The type of the value in this extension. This is used to determine how to interpret the value.",
+          "type": "string",
+          "widget": {
+            "id": "string"
+          }
+        },
+        "__$stringify": {
+          // String representation of this extension.
+          "description": "Value of the extension.",
+          "title": "Value",
+          "type": "string",
+          "readOnly": true
         }
       },
       "additionalProperties": false,
       "type": "object",
+      "title": "Extensions",
+      /*
       "widget": {
         "id": "hidden"
       }
+      */
     },
     "uri": {
       "pattern": "^\\S*$",
@@ -2601,6 +2678,9 @@
     },
     "Period": {
       "description": "A time period defined by a start and end date and optionally time.",
+      "widget": {
+        "id": "date-range"
+      },
       "properties": {
         "id": {
           "description": "Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.",
@@ -4660,9 +4740,6 @@
           },
           "additionalProperties": false,
           "type": "object",
-          "widget": {
-            "id": "row-layout"
-          },
           "fieldsets": [
             {
               "fields": [
@@ -4897,9 +4974,6 @@
           },
           "additionalProperties": false,
           "type": "object",
-          "widget": {
-            "id": "row-layout"
-          },
           "fieldsets": [
             {
               "fields": [

package/dist/formbuilder-lhcforms/assets/fl-fields-layout.json5

@@ -26,8 +26,10 @@
           { field:  "copyright", col:  12},
           { field:  "approvalDate", col:  12},
           { field:  "lastReviewDate", col:  12},
+          { field:  "effectivePeriod", col:  12},
           { field:  "contained", "col": 12},
-          { field:  "__$variable", col: 12}
+          { field:  "__$variable", col: 12},
+          { field:  "__$extensionContainer", col: 12}
         ]
       }
     ],
@@ -35,6 +37,7 @@
   },
   // Please note that the jsonpath expression paths in the keys
   overridePropertyLabels: {
+    '$.properties.extension': 'Extensions',
     '$.properties.contained': 'Contained resources',
     '$.properties.name': 'Questionnaire name',
     '$.properties.date': 'Revision date',
@@ -49,13 +52,13 @@
       id: "string",
       labelPosition: "left",
       labelClasses: "col-sm-2 m-0 ps-0 pe-1",
-      controlClasses: "col-sm-10 form-control"
+      controlClasses: "col-sm-10 m-0 p-0"
     },
     textArea: {
       id: "textarea",
       labelPosition: "left",
       labelClasses: "col-sm-2 m-0 ps-0 pe-1",
-      controlClasses: "col-sm-10 form-control"
+      controlClasses: "col-sm-10 m-0 p-0"
     },
     inputDate: {
       id: "date",
@@ -71,13 +74,42 @@
       controlClasses: "col-sm-3",
       placeholder: 'yyyy-MM-dd hh:mm:ss (AM|PM)'
     },
+    dateRange: {
+      id: "date-range",
+      labelPosition: "left",
+      labelClasses: "col-sm-2 m-0 ps-0 pe-1",
+      controlClasses: "col-sm-6",
+      showFields: [
+        {"field": "start", "col": 6},
+        {"field": "end", "col": 6}
+      ]
+    },
+    instant: {
+      id: "instant",
+      labelPosition: "left",
+      labelClasses: "col-sm-2 m-0 ps-0 pe-1",
+      controlClasses: "col-sm-3",
+      placeholder: 'yyyy-MM-dd hh:mm:ss (AM|PM)'
+    },
+    "positive-integer": {
+      id: "positive-integer",
+      labelPosition: "left",
+      labelClasses: "col-sm-2 m-0 ps-0 pe-1",
+      controlClasses: "col-sm-10 m-0 p-0"
+    },
+    "unsigned-integer": {
+      id: "unsigned-integer",
+      labelPosition: "left",
+      labelClasses: "col-sm-2 m-0 ps-0 pe-1",
+      controlClasses: "col-sm-10 m-0 p-0"
+    },
     __$terminologyServer: {
       "id": "terminology-server",
       "placeholder": "Enter url for preferred terminology server",
       "note": "You may wish to set this if you want to provide an answer value set for any item in this questionnaire.",
       "labelPosition": "left",
-      "labelWidthClass": "col-sm-2",
-      "controlWidthClass": "col-sm-10"
+      "labelClasses": "col-sm-2 ps-0 pe-1",
+      "controlClasses": "col-sm-10 m-0 p-0"
     },
     coding: {
       "id": "table",
@@ -108,6 +140,27 @@
         {"field": "status", "col": 1, "nolabel": true}
       ]
     },
+    "__$extensionContainer": {
+      "id": "extension-container",
+      "labelPosition": "left",
+      "labelClasses": "col-sm-2 ps-0 pe-1",
+      "controlClasses": "col-sm-10",
+    },
+    extension: {
+      "id": "extension",
+      "addEditAction": true,
+      "labelPosition": "left",
+      "labelClasses": "col-sm-2 ps-0 pe-1",
+      "controlClasses": "col-sm-10",
+      "addButtonLabel": "Add new extension",
+      "addButtonTitle": "Note that the extensions added by other UI elements will be disabled for editing here.",
+      "showFields": [
+        // The fields here are canonical paths of FormProperty.
+        {"field": "url", "col": 4, "nolabel": true},
+        {"field": "__$valueType", "col": 2, "nolabel": true},
+        {"field": "__$stringify", "col": 5, "nolabel": true},
+      ]
+    },
     valueSet: {
       "id": "value-set",
       "nolabel": true,
@@ -157,7 +210,7 @@
       ],
       "showDataFields": [
         {"field": "valueExpression.name", "nolabel": true, "col": 2, "title": "Name"},
-        {"field": "valueExpression.extension", "nolabel": true, "col": 3, "tile": "Type"},
+        {"field": "valueExpression.extension", "nolabel": true, "col": 3, "title": "Type"},
         {"field": "valueExpression.expression", "nolabel": true, "col": 6, "title": "Question/FHIRPath Expression/FHIR Query"}
       ]
     }
@@ -185,12 +238,18 @@
     inputDateTime: [
       '$.properties.date'
     ],
+    dateRange: [
+      '$.properties.effectivePeriod'
+    ],
     __$terminologyServer: [
       '$.properties.__$terminologyServer'
     ],
     coding: [
       '$.properties.meta.properties.tag',
     ],
+    extension: [
+      '$.properties.extension'
+    ],
     contained: [
       '$.properties.contained'
     ],
@@ -199,6 +258,9 @@
     ],
     __$variable: [
       '$.properties.__$variable'
+    ],
+    __$extensionContainer: [
+      '$.properties.__$extensionContainer'
     ]
   }
 }

package/dist/formbuilder-lhcforms/assets/items-layout.json5

@@ -22,8 +22,7 @@
           { "field": "__$valueMethod", "col": 12 },
           { "field": "initial", "title": "Default value", "col": 12 },
           { "field": "__$pickInitial", "col": 12 },
-          { "field": "__$initialExpression", "col": 12 },
-          { "field": "__$calculatedExpression", "col": 12 },
+          { "field": "__$initialCalculatedExpression", "col": 12 },
           { "field": "__$itemControl", "col": 12 },
           { "field": "__$itemControlQuestion", "col": 12 },
           { "field": "__$itemControlGroup", "col": 12 },
@@ -59,7 +58,8 @@
           { "field": "__$enableWhenExpression", "col": 12 },
           { "field": "__$terminologyServer", "col": 12 },
           { "field": "__$observationLinkPeriod", "col": 12},
-          { "field": "__$observationExtract", "col": 12}
+          { "field": "__$observationExtract", "col": 12},
+          { "field": "__$extensionContainer", "col": 12 }
         ]
       }
     ],

package/dist/formbuilder-lhcforms/assets/ngx-fl.schema.json5

@@ -194,8 +194,8 @@
       "widget": {
         "id": "string",
         "labelPosition": "left",
-        "labelWidthClass": "col-sm-2",
-        "controlWidthClass": "col-sm-2"
+        "labelClasses": "col-sm-2 m-0 ps-0 pe-1",
+        "controlClasses": "col-sm-10 m-0 p-0",
       }
     },
     "text": {
@@ -239,15 +239,22 @@
       ],
       "type": "object"
     },
+    "__$extensionContainer": {
+      "description": "May be used to represent additional information that is not part of the basic definition of the resource. To make the use of extensions safe and manageable, there is a strict set of governance  applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.",
+      "type": "string",
+      "widget": {
+        "id": "extension-container",
+      }
+    },
     "extension": {
       "description": "May be used to represent additional information that is not part of the basic definition of the resource. To make the use of extensions safe and manageable, there is a strict set of governance  applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.",
       "items": {
         "$ref": "#/definitions/Extension"
       },
       "type": "array",
-      "title": "Extension",
+      "title": "Extensions",
       "widget": {
-        "id": "hidden"
+        "id": "extension"
       }
     },
     "modifierExtension": {
@@ -1309,94 +1316,7 @@
       "title": "Variables",
       "type": "array",
       "items": {
-        "description": "A structured set of questions intended to guide the collection of answers from end-users. Questionnaires provide detailed control over order, presentation, phraseology and grouping to allow coherent, consistent data collection.",
-        "properties": {
-          "id": {
-            "description": "Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.",
-            "title": "Id",
-            "pattern": "^[ \\r\\n\\t\\S]+$",
-            "type": "string",
-            "widget": {"id": "hidden"}
-          },
-          "url": {
-            "description": "A location where the data can be accessed.",
-            "pattern": "^\\S*$",
-            "type": "string"
-          },
-          "extension": {
-            "description": "May be used to represent additional information that is not part of the basic definition of the element. To make the use of extensions safe and manageable, there is a strict set of governance  applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.",
-            "items": {
-              "$ref": "#/definitions/Extension"
-            },
-            "type": "array",
-            "title": "Extension",
-            "widget": {
-              "id": "hidden"
-            }
-          },
-          "valueString": {
-            "description": "A potential answer that's allowed as the answer to this question.",
-            "pattern": "^[ \\r\\n\\t\\S]+$",
-            "type": "string",
-            "title": "Value string",
-            "visibleIf": {
-              "/type": ["$EXP$ target.value == 'string' || target.value == 'text'"]
-            }
-          },
-          "valueExpression": {
-            "description": "Value of extension - must be one of a constrained set of the data types (see [Extensibility](extensibility.html) for a list).",
-            "properties": {
-              "id": {
-                "description": "Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.",
-                "pattern": "^[ \\r\\n\\t\\S]+$",
-                "type": "string"
-              },
-              "description": {
-                "description": "A brief, natural language description of the condition that effectively communicates the intended semantics.",
-                "pattern": "^[ \\r\\n\\t\\S]+$",
-                "type": "string"
-              },
-              "name": {
-                "description": "A short name assigned to the expression to allow for multiple reuse of the expression in the context where it is defined.",
-                "pattern": "^[A-Za-z0-9\\-\\.]{1,64}$",
-                "type": "string"
-              },
-              "language": {
-                "description": "The media type of the language for the expression.",
-                "enum": [
-                  "text/cql",
-                  "text/fhirpath",
-                  "application/x-fhir-query"
-                ],
-                "type": "string"
-              },
-              "expression": {
-                "description": "An expression in the specified language that returns a value.",
-                "pattern": "^[ \\r\\n\\t\\S]+$",
-                "type": "string"
-              },
-              "reference": {
-                "description": "A URI that defines where the expression is found.",
-                "pattern": "^\\S*$",
-                "type": "string"
-              },
-              "extension": {
-                "description": "May be used to represent additional information that is not part of the basic definition of the element. To make the use of extensions safe and manageable, there is a strict set of governance  applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.",
-                "items": {
-                  "$ref": "#/definitions/Extension"
-                },
-                "type": "array",
-                "widget": {
-                  "id": "hidden"
-                }
-              }
-            },
-            "additionalProperties": false,
-            "type": "object"
-          }
-        },
-        "additionalProperties": false,
-        "type": "object"
+        "$ref": "#/definitions/Extension"
       }
     }
   },
@@ -1436,7 +1356,8 @@
         "description",
         "purpose",
         "__$terminologyServer",
-        "__$variable"
+        "__$variable",
+        "__$extensionContainer"
       ]
     },
     {