Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue/639 #950

Merged
merged 11 commits into from
Aug 21, 2024
Merged

Issue/639 #950

merged 11 commits into from
Aug 21, 2024

Conversation

ryuuzake
Copy link
Contributor

@ryuuzake ryuuzake commented Aug 6, 2024

Resolves #639

Here some proves that the components works

Storybook Playground
image image

@fongsean
Copy link
Collaborator

Hi @ryuuzake, just providing some updates:

I have added some changes to handle initial/pre-pop in https://github.com/aehrc/smart-forms/commits/issue/639/.

After that I also want to add changes so that it works with calculatedExpression with unit - handling of Quantity datatype in fhirpath http://hl7.org/fhirpath/N1/#quantity. I can't quite finish it today, hopefully I get to finish it tomorrow.

@fongsean
Copy link
Collaborator

Hi @ryuuzake,

See konsulin-care/smart-forms@issue/639...aehrc:smart-forms:issue/639

I've added the following changes:

  1. Added optional comparator field
  2. Added code to handle pre-population of quantity elements (comparator, value, unit)
  3. Added a whole new hook for managing calculation expressions in Quantity components
  4. Added more Quantity stories for visual testing
Feature Storybook
Comparator field image
Calculation image

If it looks good, can you merge it into your branch? I'll give it one last review and merge it into main after.

@fongsean
Copy link
Collaborator

Oops, I forgot I will need to update the documentation as well.
I'll get it done at the end of today.

# Conflicts:
#	apps/smart-forms-app/package.json
#	package-lock.json
#	packages/smart-forms-renderer/package.json
@fongsean
Copy link
Collaborator

fongsean commented Aug 19, 2024

Added documentation for the Quantity component.
konsulin-care/smart-forms@issue/639...aehrc:smart-forms:issue/639

I've merged main into this branch a couple times now, so the conflicts might get nasty.
Hopefully the conflicts are all in package.json and package-lock.json. If thats the case, you can accept right and run npm i again.

Let me know how it goes and I'll see if there's an alternative solution.

@ryuuzake
Copy link
Contributor Author

Hi @fongsean

I'll try to check on the changes later tonight. If everything checks out, I'll resolve the conflict and merge it.

Hopefully this PR can soon be accepted to the main branch

@ryuuzake
Copy link
Contributor Author

Hi @fongsean
Sorry for the slow response. I already merge your changes to this PR

@fongsean
Copy link
Collaborator

Thanks @ryuuzake!

@fongsean fongsean merged commit 4a7ff5b into aehrc:main Aug 21, 2024
1 check passed
@ryuuzake ryuuzake deleted the issue/639 branch August 21, 2024 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build reference and quantity components
2 participants