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.

Sign up for GitHub

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

Jump to bottom

TRUNK-4123, 4124, 4125 - Mujir/Sushmita - Adding fields to order as per new order entry api #430

Closed
wants to merge 7 commits into from
Closed

TRUNK-4123, 4124, 4125 - Mujir/Sushmita - Adding fields to order as per new order entry api #430

wants to merge 7 commits into from

Conversation

sushmitharaos
Copy link
Contributor

  1. added previous_order to orders
  2. added action to orders
  3. renaming drug_order.complex to drug_order.structured_dosing

@mujir
TRUNK-4122, 4123, 4124 - Mujir/Sushmita
2cdc32c 
1. added order_number to orders
2. added previous_order to orders
3. added action to orders
wluyima
wluyima reviewed Oct 29, 2013
View reviewed changes
api/src/main/java/org/openmrs/Provider.java
@@ -125,6 +125,13 @@ public String getName() {
}

/**
* @see Person#getPersonName()
*/
public PersonName getPersonName() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this required for these tickets?

@wluyima
Copy link
Member

wluyima commented Oct 29, 2013

Hi @sushmitharaos thanks for working on this. It is good to work on each ticket individually and create a single PR for each rather than combining them, it makes it easier to follow up work for each ticket individually

@wluyima
Copy link
Member

wluyima commented Oct 29, 2013

@sushmitharaos you can ignore my previous comment about combining tickets, if it makes life easier for you then feel free to do it

wluyima
wluyima reviewed Oct 29, 2013
View reviewed changes
api/src/main/java/org/openmrs/Order.java
@@ -466,4 +481,71 @@ public Urgency getUrgency() {
public void setUrgency(Urgency urgency) {
this.urgency = urgency;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to add @SInCE 1.10 to the new getters/setters

@wluyima
Copy link
Member

wluyima commented Oct 31, 2013

Good work, just left one comment about setting order_action values, lets see what for what other DEVs and see what to do

djazayeri
djazayeri reviewed Nov 6, 2013
View reviewed changes
api/src/main/java/org/openmrs/DrugOrder.java
/**
* @deprecated use {@link #structuredDosing}
*/
@Deprecated
private Boolean complex = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we shouldn't have a deprecated field for this. The getter/setter methods should be deprecated, but this field should be removed and replaced.

@wluyima
Copy link
Member

wluyima commented Nov 6, 2013

@djazayeri i had added some comments on the commit she added at mujir@4689bb5

@wluyima wluyima closed this Nov 8, 2013
@wluyima wluyima reopened this Nov 8, 2013
wluyima
wluyima reviewed Nov 20, 2013
View reviewed changes
api/src/main/resources/liquibase-update-to-latest.xml

<renameColumn tableName="drug_order" oldColumnName="complex" newColumnName="dosing_type" columnDataType="varchar(50)"/>

<update tableName="drug_order">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason this changeset fails for me when i get to these updates

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still fails for me, i dropped the DB and tried a fresh install and still fails, will ask someone to try it on their machine

@wluyima
Copy link
Member

wluyima commented Nov 27, 2013

Merged the code

@wluyima wluyima closed this Nov 27, 2013
RandilaP pushed a commit to RandilaP/openmrs-core that referenced this pull request Jul 31, 2023
@brandones @donaldkibet
@prathamesh-mutkure @denniskigen @ibacher @ZacButko
4.0 (openmrs#425)
8f1b7f5 
* 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
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@sushmitharaos @wluyima @djazayeri @arathyjan @mujir