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

[#TRUNK-4169] Add quantity and units properties to DrugIngredient class #487

Closed
wants to merge 1 commit into from

Conversation

k-joseph
Copy link
Member

fixed https://tickets.openmrs.org/browse/TRUNK-4169 | added both quantity and units properties to drug ingredients

@wluyima wluyima closed this Dec 19, 2013
RandilaP pushed a commit to RandilaP/openmrs-core that referenced this pull request Jul 31, 2023
RandilaP pushed a commit to RandilaP/openmrs-core that referenced this pull request Jul 31, 2023
* Initial commit of 4.0

* Bump version to 4.0 (openmrs#442)

* BREAKING: O3-1267  Simplify module registry and import system (openmrs#424)

Modules compiled with the webpack configuration before and after this change are incompatible.

* Upgrade to React 18 (openmrs#430)

* (fix) Missed changing a React 16.x dep to 18.x (openmrs#441)

* 03-921 : BREAKING Upgrade to React Router v6 (openmrs#432)

* (chore) Make useLayout breakpoints consistent with CSS definitions (openmrs#413)

* (BREAKING) Upgrade to Carbon v11 (openmrs#437) (openmrs#444)

Upgrades the Carbon Design System dependency in this repository to v11.

Authored by Dennis Kigen <kigen.work@gmail.com>

All credit goes to denniskigen for this one; it is only "authored" by me because I messed up and merged his work into the wrong branch. He is added as a "co-author" below for the benefit of the algorithm.

- Disable configuration component test suite
- More ContentSwitcher tweaks
- Remove extraneous padding from backend deps container
- Add side nav background color override
- Wrap Tile component in a Layer as a substitute for the light prop
- Updates icon import paths - icons should be imported from `@carbon/react/icons` instead of `@carbon/icons-react`.
- Updates eslint `no-restricted-import` rule.
- Removes unused `moduleNameMapper` entries.
- Fix size of Download Config button.

Reverts openmrs/openmrs-esm-core#443

Restores openmrs/openmrs-esm-core#437

Co-authored-by: Dennis Kigen <kigen.work@gmail.com>

* Dependency fixup

* Fixup post-rebase

This commit fixes up components have changed or been created since the last rebase.

* (fix) Fix broken extension config test

* (fix) Important fixes

These include:

- Adding a key to the breadcrumbs list.
- Fix issues with the module registry and import system due to a bad rebase.
- Add a gray right border to the SideNav component.
- Remove an unnecessary `BrowserRouter` wrapper around the LeftNav component.
- Prefix type/interface imports with `type`.
- Replace the Carbon `TextInput.PasswordInput` component with `PasswordInput`.
- Fix the appearance of card username and password inputs on the login card.

* (fix) Update extension system for 4.0 migration

Add minipass to resolutions. See
DefinitelyTyped/DefinitelyTyped#60901 .
Should be possible to remove this soon.

* (feat) Latest changes

- Bump `@carbon/react` to v1.8.0.
- Add `@carbon/charts/styles.css` to the styleguide. This allows us to leverage the existing chart styles.
- Add `@carbon/charts/react` and `d3` to the styleguide `package.json`.

* Fix versions (openmrs#487)

* (fix) Improve debugging and error handling

* (fix) 4.0 merge fixes for '(feat): Add version numbers for apps and display them in the implementer tools openmrs#490'

* (feat) Add support for loading esm-form-app in legacy mode (openmrs#492)

* (fix) Revert broken build

Co-authored-by: Donald Kibet <chelashawdonald@yahoo.com>
Co-authored-by: Prathamesh Mutkure <pmutkure009@gmail.com>
Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
Co-authored-by: Ian <52504170+ibacher@users.noreply.github.com>
Co-authored-by: Ian <ian_bacher@brown.edu>
Co-authored-by: Zac Butko <zac.butko@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants