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

Merge master to dev 20240703 #1895

Merged
merged 30 commits into from
Jul 3, 2024
Merged

Merge master to dev 20240703 #1895

merged 30 commits into from
Jul 3, 2024

Conversation

alaboso
Copy link
Contributor

@alaboso alaboso commented Jul 3, 2024

Requirements

  • This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes the ticket number in the format OHRI-123 My PR title.
  • My work includes tests or is validated by existing tests.

Summary

Updating dev with changes that had been made directly to master branch (ET workspace and encounterlist refresh work)

Screenshots

Related Issue

Other

alaboso and others added 30 commits January 19, 2024 15:52
* Added auth for publish to npm (#1775)

* OHRI-2122 Add Program Management under the TPT Program (#1779)

* OHRI-2122 Add Program Management under the TPT Program

* Tab Naming

* Add default translation values

* OHRI-2117 Add TPT program menu (#1781)

* (chore) remove condition for release on master push (#1778)

* OHRI-2109  Add TB Prevention link under Tuberculosis program in the clinical per… (#1782)

* Add TB Prevention link under Tuberculosis program in the clinical perspectives

* renaming

* renaming

* OHRI-2119: Populate the Recent TPT tiles on the TPT patient summary board (#1783)

* Populate the Recent TPT tiles on the TPT patient summary board

* update

* Update patient-summary.component.tsx

* Update patient-summary.component.tsx

* small update

* OHRI-2109: Add TB Prevention link under Tuberculosis program in the clinical perspectives (#1787)

* slight modification - the TB Prevention link comes first followed by TB Treatment

* update on the translator

* Update en.json

* Update en.json

* Update en.json

* OHRI-2011: Add a table of all enrolled clients in TPT Program (#1789)

* Add TB Prevention link under Tuberculosis program in the clinical perspectives

* Add a table of all enrolled clients in TPT Program

* Add a table of all enrolled clients in TPT Program

* Add the Previous TPT Cases Table on the patient summary board (#1790)

* OHRI-2123 TPT Enrolment List (#1786)

* OHRI-2123 TPT Enrolment List

* Exclude Intents in the formList prop

* Update config-schema.ts

* OHRI-1916 : Maternal visits list should indicate HIV Test status not … (#1791)

* OHRI-1916 : Maternal visits list should indicate HIV Test status not HIV test result

* add hivTestStatus to transilation

* Fix hyperlink on empty table list (#1792)

---------

Co-authored-by: AJAL ODORA JONATHAN <[email protected]>
Co-authored-by: Pius Rubangakene <[email protected]>
Co-authored-by: lucyjemutai <[email protected]>
Co-authored-by: Hero <[email protected]>
…v, This tag comes from the current state of the branch
…rs-esm-ohri-pmtct to @ohri/openmrs-esm-ohri-pmtct-app
…common-lib (#1876)

* Clean Ohri commons lib, upgrade openmrs, framework and patient-common-lib

* fix lodash

* fix tb dashboard meta

* refresh encounter list after deleting encounter
(fix) Improve encounter list behaviour
(fix) Fixed Workspace window error to use WorkspaceContainer
Copy link
Contributor

@kajambiya kajambiya left a comment

Choose a reason for hiding this comment

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

LGTM

@alaboso alaboso merged commit 5fe0614 into dev Jul 3, 2024
5 checks passed
@alaboso alaboso deleted the merge-master-to-dev-20240703 branch July 3, 2024 12:58
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.

4 participants