Skip to content

Conversation

@jtquach1
Copy link
Contributor

Describe your changes

Please include a summary of the changes and the related issue/task. Please also include relevant motivation and context. List any dependencies that are required for this change, including links to other pull requests/branches in other repositories if applicable.

  • Frontend: Removed View ETASU button from Picked Up Orders tab in Pharmacy view. Fixed if condition where No orders yet. text doesn't show up when there are no orders. Applied Prettier formatting through VS Code.
  • Backend: Prevent order from being updated if its dispense status is 'Picked Up'

Issue ticket number and Jira link

Please include the Jira Ticket Number and Link for this issue/task.
https://jira.mitre.org/browse/REMS-449

Checklist before requesting a review

  • I have performed a self-review of my code
  • Ensure the target / base branch for any feature PR is set to dev not main (the only exception to this is releases from dev and hotfix branches)

Checklist for conducting a review

  • Review the code changes and make sure they all make sense and are necessary.
  • Pull the PR branch locally and test by running through workflow and making sure everything works as it is supposed to.

Workflow

Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you.

…vent from moving Picked Up order back to Verified state
@jtquach1 jtquach1 changed the title Update OrderCard and updateRx route to hide View ETASU button and pre… Prevent picked up order from being updated to verified order in frontend and backed Jul 27, 2023
@jtquach1 jtquach1 changed the title Prevent picked up order from being updated to verified order in frontend and backed Prevent picked up order from being updated to verified order in frontend and backend Jul 27, 2023
Copy link
Contributor

@KeeyanGhoreshi KeeyanGhoreshi left a comment

Choose a reason for hiding this comment

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

for future reference, when making linting/prettier changes to code that is not new, make it a separate commit. It makes it easier to tell what is actually new in the PR.

@jtquach1
Copy link
Contributor Author

for future reference, when making linting/prettier changes to code that is not new, make it a separate commit. It makes it easier to tell what is actually new in the PR.

Thanks! I'll keep that in mind. I wonder if we should have a GitHub Action that auto-applies Prettier to the files touched by the PR? Or is that handled by https://github.com/mcode/pims/actions/runs/5685884735/job/15411690590?pr=39 and https://github.com/mcode/pims/actions/runs/5685884735/job/15411691021?pr=39?

zacharyrobin
zacharyrobin previously approved these changes Jul 28, 2023
Copy link
Contributor

@zacharyrobin zacharyrobin left a comment

Choose a reason for hiding this comment

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

lgtm

@avirgulto avirgulto merged commit ede1604 into dev Jul 28, 2023
@avirgulto avirgulto deleted the fix-picked-up-orders-view-etasu-bug branch July 28, 2023 21:21
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.

6 participants