From a917d6a7ea8a115d20e31b58e29cc8fde8e88979 Mon Sep 17 00:00:00 2001 From: Faith Kamau <121166087+hiqedme@users.noreply.github.com> Date: Thu, 12 Oct 2023 12:07:39 +0300 Subject: [PATCH 1/3] POC-568: uncommented locator map (#1679) * POC-568: uncommented locator map * POC-568: Locator Map Display * POC-568: Locator Map Display --- .../locator-map/locator-map.component.html | 56 +------------------ .../locator-map/locator-map.component.ts | 16 +----- .../patient-info/patient-info.component.html | 4 +- 3 files changed, 7 insertions(+), 69 deletions(-) diff --git a/src/app/patient-dashboard/common/locator-map/locator-map.component.html b/src/app/patient-dashboard/common/locator-map/locator-map.component.html index 1eb3af07c..c3917475f 100644 --- a/src/app/patient-dashboard/common/locator-map/locator-map.component.html +++ b/src/app/patient-dashboard/common/locator-map/locator-map.component.html @@ -1,58 +1,8 @@ - -
- - - - + diff --git a/src/app/patient-dashboard/common/locator-map/locator-map.component.ts b/src/app/patient-dashboard/common/locator-map/locator-map.component.ts index 541bd2ab4..46b9f26b4 100644 --- a/src/app/patient-dashboard/common/locator-map/locator-map.component.ts +++ b/src/app/patient-dashboard/common/locator-map/locator-map.component.ts @@ -16,10 +16,6 @@ import { PatientService } from '../../services/patient.service'; styleUrls: ['./locator-map.css'] }) export class LocatorMapComponent implements OnInit, OnDestroy { - public display = false; - public addDialog = false; - public showSuccessAlert = false; - public showErrorAlert = false; public dataModel: string; public mapInfo: any; public lastUpdatedDate: string; @@ -43,15 +39,7 @@ export class LocatorMapComponent implements OnInit, OnDestroy { private personResourceService: PersonResourceService ) {} - public ngOnInit(): void {} - - public ngOnDestroy(): void {} - - public showDialog() { - this.display = true; - } - - /*public ngOnInit() { + public ngOnInit() { this.subscriptions.push( this.patientService.currentlyLoadedPatient.subscribe((patient) => { if (patient) { @@ -197,5 +185,5 @@ export class LocatorMapComponent implements OnInit, OnDestroy { public resetValues(): void { this.dataModel = null; this.pdfAvailable = false; - } */ + } } diff --git a/src/app/patient-dashboard/common/patient-info/patient-info.component.html b/src/app/patient-dashboard/common/patient-info/patient-info.component.html index 642d890a3..b88973d8d 100644 --- a/src/app/patient-dashboard/common/patient-info/patient-info.component.html +++ b/src/app/patient-dashboard/common/patient-info/patient-info.component.html @@ -81,12 +81,12 @@
Relationships
-
+
Patient Location Details
- +
From 1b972b4afcf46c71f107cb3f89e5708027c72fc9 Mon Sep 17 00:00:00 2001 From: Angie-540 <96350406+Angie-540@users.noreply.github.com> Date: Fri, 3 Nov 2023 18:29:16 +0300 Subject: [PATCH 2/3] for unsuccessful contact attempts, added maroon filter (#1682) --- .../pre-appointment-patient-list.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/shared/data-lists/pre-appointment-patient-list/pre-appointment-patient-list.component.ts b/src/app/shared/data-lists/pre-appointment-patient-list/pre-appointment-patient-list.component.ts index 85bdd42b7..db8be8df5 100644 --- a/src/app/shared/data-lists/pre-appointment-patient-list/pre-appointment-patient-list.component.ts +++ b/src/app/shared/data-lists/pre-appointment-patient-list/pre-appointment-patient-list.component.ts @@ -80,6 +80,11 @@ export class PreAppointmentPatientListComponent return { 'background-color': 'green', color: 'white' }; } else if (params.data.rescheduled_date !== null) { return { 'background-color': 'yellow' }; + } else if ( + params.data.follow_up_type !== null && + params.data.was_follow_up_successful === 0 + ) { + return { 'background-color': 'maroon', color: 'white' }; } else { return {}; } From cff94f483c184a2d728ff24c5c44379045bc5da8 Mon Sep 17 00:00:00 2001 From: Angie-540 <96350406+Angie-540@users.noreply.github.com> Date: Wed, 8 Nov 2023 17:22:43 +0300 Subject: [PATCH 3/3] for unsuccessfulcontact attempts, added pink filter (#1683) --- .../pre-appointment-patient-list.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/data-lists/pre-appointment-patient-list/pre-appointment-patient-list.component.ts b/src/app/shared/data-lists/pre-appointment-patient-list/pre-appointment-patient-list.component.ts index db8be8df5..6f34b3081 100644 --- a/src/app/shared/data-lists/pre-appointment-patient-list/pre-appointment-patient-list.component.ts +++ b/src/app/shared/data-lists/pre-appointment-patient-list/pre-appointment-patient-list.component.ts @@ -84,7 +84,7 @@ export class PreAppointmentPatientListComponent params.data.follow_up_type !== null && params.data.was_follow_up_successful === 0 ) { - return { 'background-color': 'maroon', color: 'white' }; + return { 'background-color': 'pink' }; } else { return {}; }