From 424a36d23db8dc313bd8461db54f946d39ac53eb Mon Sep 17 00:00:00 2001 From: Sean Fong Date: Wed, 29 May 2024 09:59:31 +0930 Subject: [PATCH 1/2] Another fix for time input in dateTime --- .../DateTimeItems/CustomDateTimeItem/CustomDateTimeItem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/smart-forms-renderer/src/components/FormComponents/DateTimeItems/CustomDateTimeItem/CustomDateTimeItem.tsx b/packages/smart-forms-renderer/src/components/FormComponents/DateTimeItems/CustomDateTimeItem/CustomDateTimeItem.tsx index 0916ca33..682a1974 100644 --- a/packages/smart-forms-renderer/src/components/FormComponents/DateTimeItems/CustomDateTimeItem/CustomDateTimeItem.tsx +++ b/packages/smart-forms-renderer/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; } From e91cd08e1e378e5aee1e5df8c8a997ced712b464 Mon Sep 17 00:00:00 2001 From: Sean Fong Date: Wed, 29 May 2024 10:02:30 +0930 Subject: [PATCH 2/2] Update package versions --- apps/smart-forms-app/package.json | 2 +- documentation/package.json | 2 +- package-lock.json | 6 +++--- packages/smart-forms-renderer/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/smart-forms-app/package.json b/apps/smart-forms-app/package.json index 664042de..7f4f4daa 100644 --- 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 index ce969480..16536c30 100644 --- 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 index 74687428..420d12fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,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", @@ -464,7 +464,7 @@ "name": "@aehrc/smart-forms-documentation", "version": "0.0.0", "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", @@ -43945,7 +43945,7 @@ }, "packages/smart-forms-renderer": { "name": "@aehrc/smart-forms-renderer", - "version": "0.32.1", + "version": "0.32.2", "license": "Apache-2.0", "dependencies": { "@aehrc/sdc-populate": "^2.0.3", diff --git a/packages/smart-forms-renderer/package.json b/packages/smart-forms-renderer/package.json index 5ebb861e..b297b83b 100644 --- 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": {