From 0efe9055403484565f0fe6ed24359120f39ffb75 Mon Sep 17 00:00:00 2001 From: derrick rono Date: Wed, 5 Apr 2023 15:05:18 +0300 Subject: [PATCH 1/3] 2.16.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a8bf0421c..0a5d24640 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ngx-amrs", - "version": "2.16.1-SNAPSHOT", + "version": "2.16.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ngx-amrs", - "version": "2.16.1-SNAPSHOT", + "version": "2.16.3", "dependencies": { "@ampath-kenya/ngx-openmrs-formentry": "2.12.20", "@angular/animations": "^6.1.0", diff --git a/package.json b/package.json index 2ea999379..b7ecc010a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ngx-amrs", - "version": "2.16.1-SNAPSHOT", + "version": "2.16.3", "scripts": { "ng": "ng", "start": "ng serve --host 0.0.0.0 --port 3000", From 6880e0ac8366c7329163869c27b5604bf81c806b Mon Sep 17 00:00:00 2001 From: derrick rono Date: Tue, 11 Apr 2023 17:59:18 +0300 Subject: [PATCH 2/3] Revert "POC-39:Separate CCC Number From Other Identifiers (#1549)" This reverts commit edbda847877b41844d60c8fa7f7bcf4cc37b86f0. --- .../patient-status-change-list.component.ts | 5 ---- ...-gains-and-loses-patient-list.component.ts | 20 +------------ .../patient-list/patient-list-columns.data.ts | 30 ------------------- 3 files changed, 1 insertion(+), 54 deletions(-) diff --git a/src/app/clinic-dashboard/hiv/patient-status-change-visualization/patient-status-change-list.component.ts b/src/app/clinic-dashboard/hiv/patient-status-change-visualization/patient-status-change-list.component.ts index d8eb0bb91..7e38d4310 100644 --- a/src/app/clinic-dashboard/hiv/patient-status-change-visualization/patient-status-change-list.component.ts +++ b/src/app/clinic-dashboard/hiv/patient-status-change-visualization/patient-status-change-list.component.ts @@ -38,11 +38,6 @@ export class PatientStatusChangeListComponent implements OnInit, OnDestroy { width: 200, field: 'cur_meds' }, - { - headerName: 'CCC Identifier', - width: 200, - field: 'ccc_number' - }, { headerName: 'Latest VL', width: 75, diff --git a/src/app/hiv-care-lib/patient-gains-and-loses/patient-gains-and-loses-patient-list/patient-gains-and-loses-patient-list.component.ts b/src/app/hiv-care-lib/patient-gains-and-loses/patient-gains-and-loses-patient-list/patient-gains-and-loses-patient-list.component.ts index 380350f7a..ccf1c35f8 100644 --- a/src/app/hiv-care-lib/patient-gains-and-loses/patient-gains-and-loses-patient-list/patient-gains-and-loses-patient-list.component.ts +++ b/src/app/hiv-care-lib/patient-gains-and-loses/patient-gains-and-loses-patient-list/patient-gains-and-loses-patient-list.component.ts @@ -43,27 +43,9 @@ export class PatientGainsAndLosesPatientListComponent implements OnInit { { headerName: 'Name', field: 'person_name', - width: 200, + width: 250, pinned: true }, - { - headerName: 'CCC Identifier', - field: 'ccc_number', - width: 100, - pinned: 'left' - }, - { - headerName: 'OVCID', - field: 'ovcid_id', - width: 100, - pinned: 'left' - }, - { - headerName: 'NUPI Identifier', - field: 'upi_number', - width: 100, - pinned: 'left' - }, { headerName: 'Gender', field: 'gender', width: 100 }, { headerName: 'Age', field: 'age', width: 100 } ]; diff --git a/src/app/shared/data-lists/patient-list/patient-list-columns.data.ts b/src/app/shared/data-lists/patient-list/patient-list-columns.data.ts index da1e1179f..4785d852f 100644 --- a/src/app/shared/data-lists/patient-list/patient-list-columns.data.ts +++ b/src/app/shared/data-lists/patient-list/patient-list-columns.data.ts @@ -23,36 +23,6 @@ export class PatientListColumns { filter: 'text', cellClass: 'identifier-column' }, - { - headerName: 'CCC Identifier', - width: 120, - field: 'ccc_number', - cellStyle: { - 'white-space': 'normal' - }, - pinned: true, - filter: 'text' - }, - { - headerName: 'OVCID', - width: 120, - field: 'ovcid_id', - cellStyle: { - 'white-space': 'normal' - }, - pinned: true, - filter: 'text' - }, - { - headerName: 'NUPI Identifier', - width: 120, - field: 'upi_number', - cellStyle: { - 'white-space': 'normal' - }, - pinned: true, - filter: 'text' - }, { headerName: 'Person Name', width: 120, From 5f118d700b2444187e889cac4485c8acb213d2c5 Mon Sep 17 00:00:00 2001 From: derrick rono Date: Wed, 12 Apr 2023 12:58:14 +0300 Subject: [PATCH 3/3] add bp columns to dqa report --- package.json | 2 +- .../chart-abstraction-patientlist.component.ts | 2 ++ src/app/shared/report-filters/report-filters.component.ts | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b7ecc010a..fc75af664 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ngx-amrs", - "version": "2.16.3", + "version": "2.16.3-SNAPSHOT", "scripts": { "ng": "ng", "start": "ng serve --host 0.0.0.0 --port 3000", diff --git a/src/app/hiv-care-lib/dqa-reports/chart-abstraction-patientlist/chart-abstraction-patientlist.component.ts b/src/app/hiv-care-lib/dqa-reports/chart-abstraction-patientlist/chart-abstraction-patientlist.component.ts index b26b94e50..56752cd45 100644 --- a/src/app/hiv-care-lib/dqa-reports/chart-abstraction-patientlist/chart-abstraction-patientlist.component.ts +++ b/src/app/hiv-care-lib/dqa-reports/chart-abstraction-patientlist/chart-abstraction-patientlist.component.ts @@ -81,6 +81,8 @@ export class ChartAbstractionPatientlistComponent implements OnInit { height: 'Height', muac: 'MUAC', BMI: 'BMI', + sysBP: 'Systolic BP', + dysBP: 'Diastolic BP', nutrition: 'Nutrition Assessment Done', DSD: 'DSD Model', hiv_start_date: 'Date Confirmed HIV Positive', diff --git a/src/app/shared/report-filters/report-filters.component.ts b/src/app/shared/report-filters/report-filters.component.ts index 437c500e7..82852f4fa 100644 --- a/src/app/shared/report-filters/report-filters.component.ts +++ b/src/app/shared/report-filters/report-filters.component.ts @@ -718,7 +718,9 @@ export class ReportFiltersComponent public onpatientTypeChange($event: any): void { this.patientTypeChange.emit($event.value); } - + public onsampleSizeChange($event: any): void { + this.sampleSizeChange.emit($event.value); + } public selectAllProgramsFT() { this.onSelectAllPrograms.emit(); }