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

CSY audit report: operative care #159

Open
wants to merge 10 commits into
base: feat/csy-reports-refactor
Choose a base branch
from
Open

CSY audit report: operative care #159

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ffe31e0
feat: implement report ui
deeonwuli Sep 17, 2024
3c11416
feat: move download audit report function to presentation layer
deeonwuli Sep 18, 2024
a73ee5a
feat: implement audit filters
deeonwuli Sep 18, 2024
b41124f
fix: event query string
deeonwuli Sep 19, 2024
7e4d8cd
feat: intraop audit filter, acute emergency audit filter
deeonwuli Sep 23, 2024
fa657ff
feat: add csy audit operative build script
deeonwuli Sep 23, 2024
e1c3366
feat: use facility date and time dataelement
deeonwuli Sep 23, 2024
6f2c6ff
fix: use fixed start year for period filter in csy reports
deeonwuli Sep 24, 2024
79e71e8
fix: translation files
deeonwuli Sep 25, 2024
a096a27
refactor: move objects outside of component
deeonwuli Sep 25, 2024
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
6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
"two-factor-monitoring-build": "REACT_APP_DHIS2_BASE_URL='' REACT_APP_DHIS2_AUTH='' yarn two-factor-monitoring-build-folder && rm -f $npm_package_name.zip && cd build && rm -f manifest.json mal-favicon.ico && zip --quiet -r ../$npm_package_name.zip *",
"csy-audit-emergency-build-folder": "rm -rf build/ && d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_csy_audit_emergency && react-scripts build && yarn run csy-audit-emergency-manifest && cp -r i18n icon.png build",
"csy-audit-emergency-build": "REACT_APP_DHIS2_BASE_URL='' REACT_APP_DHIS2_AUTH='' yarn csy-audit-emergency-build-folder && rm -f $npm_package_name.zip && cd build && rm -f manifest.json mal-favicon.ico && zip --quiet -r ../$npm_package_name.zip *",
"csy-audit-operative-build-folder": "rm -rf build/ && d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_csy_audit_operative && react-scripts build && yarn run csy-audit-operative-manifest && cp -r i18n icon.png build",
"csy-audit-operative-build": "REACT_APP_DHIS2_BASE_URL='' REACT_APP_DHIS2_AUTH='' yarn csy-audit-operative-build-folder && rm -f $npm_package_name.zip && cd build && rm -f manifest.json mal-favicon.ico && zip --quiet -r ../$npm_package_name.zip *",
"csy-audit-trauma-build-folder": "rm -rf build/ && d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_csy_audit_trauma && react-scripts build && yarn run csy-audit-trauma-manifest && cp -r i18n icon.png build",
"csy-audit-trauma-build": "REACT_APP_DHIS2_BASE_URL='' REACT_APP_DHIS2_AUTH='' yarn csy-audit-trauma-build-folder && rm -f $npm_package_name.zip && cd build && rm -f manifest.json mal-favicon.ico && zip --quiet -r ../$npm_package_name.zip *",
"csy-summary-mortality-build-folder": "rm -rf build/ && d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_csy_summary_mortality && react-scripts build && yarn run csy-summary-mortality-manifest && cp -r i18n icon.png build",
Expand Down Expand Up @@ -94,6 +96,7 @@
"authorities-monitoring-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_authorities_monitoring",
"two-factor-monitoring-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_twofactor_monitoring",
"csy-audit-emergency-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_csy_audit_emergency",
"csy-audit-operative-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_csy_audit_operative",
"csy-audit-trauma-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_csy_audit_trauma",
"csy-summary-mortality-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_csy_summary_mortality",
"csy-summary-patient-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_csy_summary_patient",
Expand Down Expand Up @@ -123,6 +126,7 @@
"two-factor-monitoring": "1.0.0",
"authorities-monitoring": "1.0.0",
"csy-audit-emergency": "1.0.0",
"csy-audit-operative": "1.0.0",
"csy-audit-trauma": "1.0.0",
"csy-summary-mortality": "1.0.0",
"csy-summary-patient": "1.0.0",
Expand Down Expand Up @@ -208,4 +212,4 @@
}
}
}
}
}
6 changes: 6 additions & 0 deletions src/compositionRoot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { GetSubscriptionUseCase } from "./domain/reports/mal-data-subscription/u
import { GetMonitoringUseCase as GetSubscriptionMonitoringUseCase } from "./domain/reports/mal-data-subscription/usecases/GetMonitoringUseCase";
import { SaveMonitoringUseCase as SaveSubscriptionMonitoringUseCase } from "./domain/reports/mal-data-subscription/usecases/SaveMonitoringUseCase";
import { AuditItemD2Repository as CSYAuditEmergencyD2Repository } from "./data/reports/csy-audit-emergency/AuditItemD2Repository";
import { AuditItemD2Repository as CSYAuditOperativeD2Repository } from "./data/reports/csy-audit-operative/AuditItemD2Repository";
import { GetAuditEmergencyUseCase } from "./domain/reports/csy-audit-emergency/usecases/GetAuditEmergencyUseCase";
import { SaveAuditEmergencyUseCase } from "./domain/reports/csy-audit-emergency/usecases/SaveAuditEmergencyUseCase";
import { GetAuditTraumaUseCase } from "./domain/reports/csy-audit-trauma/usecases/GetAuditTraumaUseCase";
Expand Down Expand Up @@ -104,10 +105,12 @@ import { GetMonitoringTwoFactorColumnsUseCase } from "./domain/reports/twofactor
import { SaveMonitoringTwoFactorUseCase } from "./domain/reports/twofactor-monitoring/usecases/SaveMonitoringTwoFactorUseCase";
import { MonitoringTwoFactorD2Repository } from "./data/reports/twofactor-monitoring/MonitoringTwoFactorD2Repository";
import { GetOrgUnitsWithChildrenUseCase } from "./domain/reports/glass-data-submission/usecases/GetOrgUnitsWithChildrenUseCase";
import { GetAuditOperativeUseCase } from "./domain/reports/csy-audit-operative/usecases/GetAuditOperativeUseCase";

export function getCompositionRoot(api: D2Api) {
const configRepository = new Dhis2ConfigRepository(api, getReportType());
const csyAuditEmergencyRepository = new CSYAuditEmergencyD2Repository(api);
const csyAuditOperativeRepository = new CSYAuditOperativeD2Repository(api);
const csyAuditTraumaRepository = new CSYAuditTraumaD2Repository(api);
const dataCommentsRepository = new NHWADataCommentsDefaultRepository(api);
const dataApprovalRepository = new NHWADataApprovalDefaultRepository(api);
Expand Down Expand Up @@ -174,6 +177,9 @@ export function getCompositionRoot(api: D2Api) {
get: new GetAuditEmergencyUseCase(csyAuditEmergencyRepository),
save: new SaveAuditEmergencyUseCase(csyAuditEmergencyRepository),
}),
auditOperative: getExecute({
get: new GetAuditOperativeUseCase(csyAuditOperativeRepository),
}),
auditTrauma: getExecute({
get: new GetAuditTraumaUseCase(csyAuditTraumaRepository),
save: new SaveAuditTraumaUseCase(csyAuditTraumaRepository),
Expand Down
6 changes: 6 additions & 0 deletions src/data/common/Dhis2ConfigRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ const base = {
constantCode: "",
approvalWorkflows: { namePrefix: "" },
},
auditOperative: {
dataSets: { namePrefix: "NONE", nameExcluded: /-APVD$/ },
sqlViewNames: [],
constantCode: "",
approvalWorkflows: { namePrefix: "" },
},
auditTrauma: {
dataSets: { namePrefix: "NONE", nameExcluded: /-APVD$/ },
sqlViewNames: [],
Expand Down
Loading