From baa8a955086c8f0ba36dec408a9fa5d57efd5449 Mon Sep 17 00:00:00 2001 From: Alfred-Mutai Date: Wed, 7 Feb 2024 12:59:12 +0300 Subject: [PATCH 1/2] Update DATIM patient list to meet new requirements --- src/app/build-version/build-version.component.ts | 4 ++-- .../tx-curr-report-patient-list.component.ts | 3 +++ .../tx-ml-report-patient-list.component.ts | 3 +++ .../tx-mmd-report-patient-list.component.ts | 3 +++ .../tx-new-report-patient-list.component.ts | 3 +++ .../tx-rtt-report-patient-list.component.ts | 3 +++ 6 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/app/build-version/build-version.component.ts b/src/app/build-version/build-version.component.ts index d1f229b80..7d1241ad5 100644 --- a/src/app/build-version/build-version.component.ts +++ b/src/app/build-version/build-version.component.ts @@ -8,7 +8,7 @@ import { VERSION } from '../../environments/version'; }) export class BuildVersionComponent implements OnInit { public version: string; - public buildDate: Date; + public buildDate: string; public hash: string; constructor() {} @@ -20,7 +20,7 @@ export class BuildVersionComponent implements OnInit { try { this.version = VERSION.version; this.hash = VERSION.hash; - this.buildDate = new Date(VERSION.buildDate); + this.buildDate = 'build Jan 15, 2024, 6:51:04 PM'; // new Date(VERSION.buildDate); } catch (e) {} } } diff --git a/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-patient-list/tx-curr-report-patient-list.component.ts b/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-patient-list/tx-curr-report-patient-list.component.ts index 44018923b..c8e8a0f4c 100644 --- a/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-patient-list/tx-curr-report-patient-list.component.ts +++ b/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-patient-list/tx-curr-report-patient-list.component.ts @@ -56,12 +56,15 @@ export class TxCurrReportPatientListComponent implements OnInit { public addExtraColumns() { const extraColumns = { + weight: 'Weight', phone_number: 'Phone', enrollment_date: 'Enrolment Date', last_appointment: 'Last Appointment', latest_rtc_date: 'Latest RTC Date', days_since_rtc_date: 'Days since RTC', arv_first_regimen: 'ARV first regimen', + cd4_1: 'CD4', + cd4_1_date: 'CD4 Date', arv_first_regimen_start_date: 'First ARV start date', cur_meds: 'Current Regimen', cur_arv_line: 'Current ARV Line', diff --git a/src/app/hiv-care-lib/tx-ml-report/tx-ml-report-patient-list/tx-ml-report-patient-list.component.ts b/src/app/hiv-care-lib/tx-ml-report/tx-ml-report-patient-list/tx-ml-report-patient-list.component.ts index b489dc493..5cc0afd57 100644 --- a/src/app/hiv-care-lib/tx-ml-report/tx-ml-report-patient-list/tx-ml-report-patient-list.component.ts +++ b/src/app/hiv-care-lib/tx-ml-report/tx-ml-report-patient-list/tx-ml-report-patient-list.component.ts @@ -54,12 +54,15 @@ export class TxMlReportPatientListComponent implements OnInit { public addExtraColumns() { const extraColumns = { + weight: 'Weight', phone_number: 'Phone', enrollment_date: 'Enrolment Date', last_appointment: 'Last Appointment', latest_rtc_date: 'Latest RTC Date', days_since_rtc_date: 'Days since RTC', arv_first_regimen: 'ARV first regimen', + cd4_1: 'CD4', + cd4_1_date: 'CD4 Date', arv_first_regimen_start_date: 'First ARV start date', cur_meds: 'Current Regimen', cur_arv_line: 'Current ARV Line', diff --git a/src/app/hiv-care-lib/tx-mmd-report/tx-mmd-report-patient-list/tx-mmd-report-patient-list.component.ts b/src/app/hiv-care-lib/tx-mmd-report/tx-mmd-report-patient-list/tx-mmd-report-patient-list.component.ts index 1baa46394..726eb925a 100644 --- a/src/app/hiv-care-lib/tx-mmd-report/tx-mmd-report-patient-list/tx-mmd-report-patient-list.component.ts +++ b/src/app/hiv-care-lib/tx-mmd-report/tx-mmd-report-patient-list/tx-mmd-report-patient-list.component.ts @@ -54,12 +54,15 @@ export class TxMmdReportPatientListComponent implements OnInit { public addExtraColumns() { const extraColumns = { + weight: 'Weight', phone_number: 'Phone', enrollment_date: 'Enrolment Date', last_appointment: 'Last Appointment', latest_rtc_date: 'Latest RTC Date', days_since_rtc_date: 'Days since RTC', arv_first_regimen: 'ARV first regimen', + cd4_1: 'CD4', + cd4_1_date: 'CD4 Date', arv_first_regimen_start_date: 'First ARV start date', cur_meds: 'Current Regimen', cur_arv_line: 'Current ARV Line', diff --git a/src/app/hiv-care-lib/tx-new-report/tx-new-report-patient-list/tx-new-report-patient-list.component.ts b/src/app/hiv-care-lib/tx-new-report/tx-new-report-patient-list/tx-new-report-patient-list.component.ts index d86698cf0..557c3cea0 100644 --- a/src/app/hiv-care-lib/tx-new-report/tx-new-report-patient-list/tx-new-report-patient-list.component.ts +++ b/src/app/hiv-care-lib/tx-new-report/tx-new-report-patient-list/tx-new-report-patient-list.component.ts @@ -54,12 +54,15 @@ export class TxNewReportPatientListComponent implements OnInit { public addExtraColumns() { const extraColumns = { + weight: 'Weight', phone_number: 'Phone', enrollment_date: 'Enrolment Date', last_appointment: 'Last Appointment', latest_rtc_date: 'Latest RTC Date', days_since_rtc_date: 'Days since RTC', arv_first_regimen: 'ARV first regimen', + cd4_1: 'CD4', + cd4_1_date: 'CD4 Date', arv_first_regimen_start_date: 'First ARV start date', cur_meds: 'Current Regimen', cur_arv_line: 'Current ARV Line', diff --git a/src/app/hiv-care-lib/tx-rtt-report/tx-rtt-report-patient-list/tx-rtt-report-patient-list.component.ts b/src/app/hiv-care-lib/tx-rtt-report/tx-rtt-report-patient-list/tx-rtt-report-patient-list.component.ts index d813f7e9a..9346a5fb5 100644 --- a/src/app/hiv-care-lib/tx-rtt-report/tx-rtt-report-patient-list/tx-rtt-report-patient-list.component.ts +++ b/src/app/hiv-care-lib/tx-rtt-report/tx-rtt-report-patient-list/tx-rtt-report-patient-list.component.ts @@ -54,12 +54,15 @@ export class TxRttReportPatientListComponent implements OnInit { public addExtraColumns() { const extraColumns = { + weight: 'Weight', phone_number: 'Phone', enrollment_date: 'Enrolment Date', last_appointment: 'Last Appointment', latest_rtc_date: 'Latest RTC Date', days_since_rtc_date: 'Days since RTC', arv_first_regimen: 'ARV first regimen', + cd4_1: 'CD4', + cd4_1_date: 'CD4 Date', arv_first_regimen_start_date: 'First ARV start date', cur_meds: 'Current Regimen', cur_arv_line: 'Current ARV Line', From 4738afe26ff395ab6420ede8b503293efcc1a45d Mon Sep 17 00:00:00 2001 From: Alfred-Mutai Date: Wed, 7 Feb 2024 13:47:31 +0300 Subject: [PATCH 2/2] Update DATIM patient list to meet new requirements --- src/app/build-version/build-version.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/build-version/build-version.component.ts b/src/app/build-version/build-version.component.ts index 7d1241ad5..d1f229b80 100644 --- a/src/app/build-version/build-version.component.ts +++ b/src/app/build-version/build-version.component.ts @@ -8,7 +8,7 @@ import { VERSION } from '../../environments/version'; }) export class BuildVersionComponent implements OnInit { public version: string; - public buildDate: string; + public buildDate: Date; public hash: string; constructor() {} @@ -20,7 +20,7 @@ export class BuildVersionComponent implements OnInit { try { this.version = VERSION.version; this.hash = VERSION.hash; - this.buildDate = 'build Jan 15, 2024, 6:51:04 PM'; // new Date(VERSION.buildDate); + this.buildDate = new Date(VERSION.buildDate); } catch (e) {} } }