Merge pull request #825 from aehrc/issue/822

Issue/822
aehrc · May 29, 2024 · 03cafbe · 03cafbe
2 parents d0e2e0f + e91cd08
commit 03cafbe
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/apps/smart-forms-app/package.json b/apps/smart-forms-app/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "@aehrc/sdc-assemble": "^1.2.0",
     "@aehrc/sdc-populate": "^2.0.3",
-    "@aehrc/smart-forms-renderer": "^0.32.1",
+    "@aehrc/smart-forms-renderer": "^0.32.2",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@fontsource/material-icons": "^5.0.16",

diff --git a/documentation/package.json b/documentation/package.json
@@ -15,7 +15,7 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@aehrc/smart-forms-renderer": "^0.32.1",
+    "@aehrc/smart-forms-renderer": "^0.32.2",
     "@docusaurus/core": "3.3.2",
     "@docusaurus/preset-classic": "3.3.2",
     "@docusaurus/theme-live-codeblock": "^3.3.2",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/smart-forms-renderer/package.json b/packages/smart-forms-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aehrc/smart-forms-renderer",
-  "version": "0.32.1",
+  "version": "0.32.2",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {

diff --git a/...rer/src/components/FormComponents/DateTimeItems/CustomDateTimeItem/CustomDateTimeItem.tsx b/...rer/src/components/FormComponents/DateTimeItems/CustomDateTimeItem/CustomDateTimeItem.tsx
@@ -130,7 +130,7 @@ function CustomDateTimeItem(props: CustomDateTimeItemProps) {
     }
 
     const { timeIsValid, is24HourNotation } = validateTimeInput(newTimeInput, newPeriodInput);
-    if (!validateDateInput(dateInput) && !timeIsValid) {
+    if (!validateDateInput(dateInput) || !timeIsValid) {
       return;
     }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         const { timeIsValid, is24HourNotation } = validateTimeInput(newTimeInput, newPeriodInput);
-        if (!validateDateInput(dateInput) && !timeIsValid) {
+        if (!validateDateInput(dateInput) || !timeIsValid) {
           return;
         }
@@ Expand Down @@