Skip to content

HAI-753, add warning on the patient header when HIV program location … #445

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

Open
cioan wants to merge 5 commits into
base: master
Choose a base branch
from
Open

HAI-753, add warning on the patient header when HIV program location … #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25e3785
HAI-753, add warning on the patient header when HIV program location …
cioan Sep 19, 2023
11e7041
trying to display alert message
Dutervil Sep 25, 2023
c9fafa1
Merge branch 'HAI-753' of https://github.com/PIH/openmrs-module-pihco…
Dutervil Sep 25, 2023
caf2c38
fixing conflic
Dutervil Sep 26, 2023
ced2f17
Merge branch 'master' into HAI-753
Dutervil Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ public static final class Extensions {

public static final String DEATH_CERTIFICATE_HEADER_EXTENSION = "pih.header.deathCertificate";

public static final String HIV_PROGRAM_LOCATION_WARNING_HEADER_EXTENSION = "pih.header.hivProgramLocationWarning";

public static final String REPORTING_AD_HOC_ANALYSIS = "reportingui.dataExports.adHoc";

public static final String ALLERGY_UI_VISIT_NOTE_NEXT_SUPPORT = "allergyui.allergires.visitNoteNextSupport";
Expand Down
14 changes: 14 additions & 0 deletions api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,10 @@ private void loadAppsAndExtensions() throws UnsupportedEncodingException {
if (config.isComponentEnabled(Components.DEATH_CERTIFICATE)) {
enableDeathCertificate();
}
if (config.isComponentEnabled(Components.HIV_PROGRAM_LOCATION_WARNING)) {
enableHivProgramLocationWarning();
}


if (config.isComponentEnabled(Components.RADIOLOGY)) {
enableRadiology();
Expand Down Expand Up @@ -760,6 +764,7 @@ private void enableConsult() {
}
}


private void enableConsultInitial() {
extensions.add(visitAction(CustomAppLoaderConstants.Extensions.CONSULT_NOTE_INITIAL_VISIT_ACTION,
"ui.i18n.EncounterType.name." + PihEmrConfigConstants.ENCOUNTERTYPE_CONSULTATION_INITIAL_UUID,
Expand Down Expand Up @@ -864,6 +869,15 @@ private void enableADT() {
findExtensionById(CustomAppLoaderConstants.EncounterTemplates.NO_DETAILS), "fas fa-fw fa-sign-out-alt", null, true, null, null);
}

private void enableHivProgramLocationWarning() {
extensions.add(fragmentExtension(CustomAppLoaderConstants.Extensions.HIV_PROGRAM_LOCATION_WARNING_HEADER_EXTENSION,
"pihcore",
"hiv/programLocationWarning",
null,
CustomAppLoaderConstants.ExtensionPoints.SECOND_LINE_HEADER,
null));

}
private void enableDeathCertificate() {

extensions.add(overallAction(CustomAppLoaderConstants.Extensions.DEATH_CERTIFICATE_OVERALL_ACTION,
Expand Down
5 changes: 4 additions & 1 deletion ...nmrs/module/pihcore/fragment/controller/hiv/ProgramLocationWarningFragmentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,7 @@ public void controller(FragmentModel model,
}
}
}
}

}
}

4 changes: 2 additions & 2 deletions omod/src/main/webapp/fragments/hiv/programLocationWarning.gsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<div>
<div id="hiv-program-location-info" style="background-color: lightcoral; padding: 10px; border-radius: 5px;">
<ul>
Expand All @@ -12,4 +11,5 @@
</ul>

</div>
</div>
</div>