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

POC-379: Datim reports #1634

Merged
merged 16 commits into from
Jun 29, 2023
Merged

POC-379: Datim reports #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9c7f5df
txml report
Alfred-Mutai May 19, 2023
73866a7
POC-133 : Add an initial Section for TX_ML reports
Alfred-Mutai Jun 1, 2023
1ed33dc
POC-133 : Add an initial Section for TX_ML reports
Alfred-Mutai Jun 1, 2023
fa63193
POC-133 : Add an initial Section for TX_ML reports
Alfred-Mutai Jun 1, 2023
b027cf0
POC-133 : Add an initial Section for TX_ML reports
Alfred-Mutai Jun 1, 2023
7b9eb72
POC-133 : Add an initial Section for TX_ML reports
Alfred-Mutai Jun 2, 2023
62d2e05
POC-133: Add an initial Section for TX_ML reports
Alfred-Mutai Jun 7, 2023
ef92c04
POC-356: DATIM Reports - Create TX_NEW
Alfred-Mutai Jun 8, 2023
24236c1
POC-355: DATIM Reports - Create TX_CURR
Alfred-Mutai Jun 9, 2023
5be5258
POC-357: DATIM Reports - Create TX_MMD
Alfred-Mutai Jun 9, 2023
2e69333
POC-379: POC-379 DATIM Reports - Create Tx_ RTT
Alfred-Mutai Jun 26, 2023
c4741f1
POC-379: DATIM Reports - Create Tx_ RTT
Alfred-Mutai Jun 27, 2023
a6ba1b3
Merge branch 'master' into POC-379
corneliouzbett Jun 29, 2023
3d51774
Update launch.json
Alfred-Mutai Jun 29, 2023
6e1f6ac
Update launch.json
Alfred-Mutai Jun 29, 2023
c749eb8
Merge branch 'master' into POC-379
corneliouzbett Jun 29, 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: 1 addition & 1 deletion .vscode/launch.json
View file
Open in desktop
Alfred-Mutai marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
]
}
]
}
}
41 changes: 23 additions & 18 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
"ngx-select": "^0.0.1",
"ngx-toastr": "^9.1.1",
"ngx-webcam": "^0.2.5",
"papaparse": "^5.4.1",
"pdfjs-dist": "~1.7.308",
"pdfkit": "^0.8.0",
"pdfmake": "0.1.25",
Expand Down
0 ...shboard/cdm/ data-analytics-cdm.routes.ts → ...ashboard/cdm/data-analytics-cdm.routes.ts
View file
Open in desktop
File renamed without changes.
17 changes: 15 additions & 2 deletions src/app/data-analytics-dashboard/hiv/data-analytics-hiv.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ import { DataAnalyticsMonthlyReportComponent } from './monthly-reports-dashboard
import { DataAnalyticsHivGainsAndLossesComponent } from './hiv-monthly-gains-and-losses/data-analytics-hiv-gains-and-losses.component';
import { ContactTestingComponent } from './contact-testing/contact-testing/contact-testing.component';
import { DialogModule } from 'primeng/primeng';
import { TxReportsDashboardComponent } from './tx-reports-dashboard/tx-reports-dashboard.component';
import { TxMlReportComponent } from './tx-ml-report/tx-ml-report.component';
import { TxNewReportComponent } from './datim-reports/tx-new-report/tx-new-report.component';
import { TxCurrReportComponent } from './datim-reports/tx-curr-report.component';
import { TxMmdReportComponent } from './datim-reports/tx-mmd-report.component';
import { TxRttReportComponent } from './datim-reports/tx-rtt-report.component';

@NgModule({
imports: [
Expand All @@ -61,7 +67,8 @@ import { DialogModule } from 'primeng/primeng';
HivCareComparativeAnalyticsComponent,
MOH412HIVDataAnalyticsComponent,
MOH412HIVDataAnalyticsPatientListComponent,
DataAnalyticsMonthlyReportComponent
DataAnalyticsMonthlyReportComponent,
TxReportsDashboardComponent
],
declarations: [
AdminDashboardClinicFlowComponent,
Expand All @@ -78,7 +85,13 @@ import { DialogModule } from 'primeng/primeng';
IPTReportComponent,
DataAnalyticsMonthlyReportComponent,
DataAnalyticsHivGainsAndLossesComponent,
ContactTestingComponent
ContactTestingComponent,
TxReportsDashboardComponent,
TxMlReportComponent,
TxNewReportComponent,
TxCurrReportComponent,
TxMmdReportComponent,
TxRttReportComponent
],
providers: [
DataAnalyticsDashboardService,
Expand Down
85 changes: 85 additions & 0 deletions src/app/data-analytics-dashboard/hiv/data-analytics-hiv.routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,17 @@ import { ContactTestingComponent } from './contact-testing/contact-testing/conta
import { FamilyTestingContactComponent } from 'src/app/hiv-care-lib/family-testing/family-testing-contact-list.component';
import { AddContactTraceComponent } from 'src/app/hiv-care-lib/family-testing/contact-trace/add-contact-trace.component';
import { EditContactTraceComponent } from 'src/app/hiv-care-lib/family-testing/contact-trace/edit-contact-trace.component';
import { TxReportsDashboardComponent } from './tx-reports-dashboard/tx-reports-dashboard.component';
import { TxMlReportComponent } from './tx-ml-report/tx-ml-report.component';
import { TxMlReportPatientListComponent } from 'src/app/hiv-care-lib/tx-ml-report/tx-ml-report-patient-list/tx-ml-report-patient-list.component';
import { TxNewReportComponent } from './datim-reports/tx-new-report/tx-new-report.component';
import { TxNewReportPatientListComponent } from 'src/app/hiv-care-lib/tx-new-report/tx-new-report-patient-list/tx-new-report-patient-list.component';
import { TxCurrReportPatientListComponent } from 'src/app/hiv-care-lib/tx-curr-report/tx-curr-report-patient-list/tx-curr-report-patient-list.component';
import { TxCurrReportComponent } from './datim-reports/tx-curr-report.component';
import { TxMmdReportPatientListComponent } from 'src/app/hiv-care-lib/tx-mmd-report/tx-mmd-report-patient-list/tx-mmd-report-patient-list.component';
import { TxMmdReportComponent } from './datim-reports/tx-mmd-report.component';
import { TxRttReportComponent } from './datim-reports/tx-rtt-report.component';
import { TxRttReportPatientListComponent } from 'src/app/hiv-care-lib/tx-rtt-report/tx-rtt-report-patient-list/tx-rtt-report-patient-list.component';
const routes: Routes = [
{
path: 'clinic-flow',
Expand Down Expand Up @@ -228,6 +239,80 @@ const routes: Routes = [
}
]
},
{
path: 'datim-report',
children: [
{
path: '',
component: TxReportsDashboardComponent
},
{
path: 'tx-ml-report',
children: [
{
path: '',
component: TxMlReportComponent
},
{
path: 'patient-list',
component: TxMlReportPatientListComponent
}
]
},
{
path: 'tx-new-report',
children: [
{
path: '',
component: TxNewReportComponent
},
{
path: 'patient-list',
component: TxNewReportPatientListComponent
}
]
},
{
path: 'tx-curr-report',
children: [
{
path: '',
component: TxCurrReportComponent
},
{
path: 'patient-list',
component: TxCurrReportPatientListComponent
}
]
},
{
path: 'tx-mmd-report',
children: [
{
path: '',
component: TxMmdReportComponent
},
{
path: 'patient-list',
component: TxMmdReportPatientListComponent
}
]
},
{
path: 'tx-rtt-report',
children: [
{
path: '',
component: TxRttReportComponent
},
{
path: 'patient-list',
component: TxRttReportPatientListComponent
}
]
}
]
},
{
path: 'dqa',
children: [
Expand Down
Loading