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 1/6] 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 2/6] 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 {}; } From ea324fd61f0d1c63712c5375756f13c58ef88c15 Mon Sep 17 00:00:00 2001 From: Saningo Lekalantula Date: Wed, 15 Nov 2023 15:37:21 +0300 Subject: [PATCH 3/6] POC-558 (#1678) * Change the Male/Female gender disaagregation to start with Female then Male * Change the Male/Female gender disaagregation to start with Female then Male --------- Co-authored-by: kantush Co-authored-by: Drizzentic --- .../prep-monthly-report-view.component.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/app/hiv-care-lib/prep-report/monthly/prep-monthly-report-view/prep-monthly-report-view.component.ts b/src/app/hiv-care-lib/prep-report/monthly/prep-monthly-report-view/prep-monthly-report-view.component.ts index 50c8a85d7..eb08b6854 100644 --- a/src/app/hiv-care-lib/prep-report/monthly/prep-monthly-report-view/prep-monthly-report-view.component.ts +++ b/src/app/hiv-care-lib/prep-report/monthly/prep-monthly-report-view/prep-monthly-report-view.component.ts @@ -55,6 +55,12 @@ export class PrepMonthlyReportViewComponent implements OnInit, OnChanges { this.indicatorSelected.emit(payload); } + swapIndices(arr: any[]) { + for (let i = 0; i < arr.length - 1; i += 2) { + [arr[i], arr[i + 1]] = [arr[i + 1], arr[i]]; + } + } + public buildTableBody() { this.tableSectionData = this.SummaryData; this.tableSectionIndicators = this.sectionDefs; @@ -88,6 +94,13 @@ export class PrepMonthlyReportViewComponent implements OnInit, OnChanges { } ); + // Find the first occurrence of 'F' in the original array + const firstFIndex = this.genderGroups.indexOf('F'); + + this.genderGroups = this.genderGroups + .slice(firstFIndex) + .concat(this.genderGroups.slice(0, firstFIndex)); + // Table data // Remove the first two sections const allData = this.tableSectionIndicators.slice(2); @@ -96,6 +109,7 @@ export class PrepMonthlyReportViewComponent implements OnInit, OnChanges { this.tableData.push({ sectionTitle: section.sectionTitle, sectionData: section.indicators.map((sect) => { + this.swapIndices(sect.indicators); return { rowTitle: sect.label, rowData: sect.indicators.map((val) => { From 3149fd888cb91b169429b344ed8bde71c139ba6e Mon Sep 17 00:00:00 2001 From: Angie-540 <96350406+Angie-540@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:14:37 +0300 Subject: [PATCH 4/6] POC-492: Modified pre-appointment to display failed phone attempts (#1681) --- .../pre-appointment-outreach.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts b/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts index d81010b4a..7bcd5431c 100644 --- a/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts +++ b/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts @@ -215,6 +215,11 @@ export class PreAppointmentOutreachComponent implements OnInit { width: 100, field: 'rescheduled_date' }, + { + headerName: 'No. of Failed Phone Attempts', + width: 100, + field: 'number_of_failed_phone_attempts' + }, { headerName: 'Contact Reached', width: 100, From ecd37da9ec441bc6f5cb6790dd848a5ac527fa97 Mon Sep 17 00:00:00 2001 From: Angie-540 <96350406+Angie-540@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:19:53 +0300 Subject: [PATCH 5/6] POC-570:remove program snapshot tag after patient has made clinical visit (#1687) * remove program snapshot tag after patient has made clinical visit * fixed pre-appoinment-reminder tag on program snapshot * POC-570:fixed pre-appoinment-reminder tag on program snapshot * Update src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.ts --------- Co-authored-by: Drizzentic --- .../hiv/program-snapshot/hiv-program-snapshot.component.html | 5 ++++- .../hiv/program-snapshot/hiv-program-snapshot.component.ts | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.html b/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.html index bcde35032..a9a4f621c 100644 --- a/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.html +++ b/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.html @@ -57,7 +57,10 @@

diff --git a/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.ts b/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.ts index 050f7b703..d4150513d 100644 --- a/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.ts +++ b/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.ts @@ -299,7 +299,8 @@ export class HivProgramSnapshotComponent implements OnInit { if ( result && result.predicted_prob_disengage && - result.predicted_risk + result.predicted_risk && + result.observed_rtc_date === null ) { this.hasPredictedScore = true; this.prediction = result; From 44f627e18e967198142afef1726cad37dcd0b688 Mon Sep 17 00:00:00 2001 From: Angie-540 <96350406+Angie-540@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:49:05 +0300 Subject: [PATCH 6/6] POC-495 (#1685) * customised toastr for pre-appointment rescheduled appointments * added pre-appointment banner for patients who rescheduled appointments * added customised toastr for predicted patients who rescheduled appointments * POC-495: added customised toastr for predicted patients with rescheduled appointments added customised toastr for predicted patients who rescheduled appointments POC-495: added customised toastr for predicted patients with rescheduled appointments --------- Co-authored-by: Drizzentic --- .../patient-reminder-custom.component.css | 30 +++++++++++++++++++ .../patient-reminder.component.css | 5 ++++ .../patient-reminders.component.ts | 10 ++++++- .../patient-reminders.components.html | 14 +++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/src/app/patient-dashboard/common/patient-reminders/patient-reminder-custom.component.css b/src/app/patient-dashboard/common/patient-reminders/patient-reminder-custom.component.css index 4354e7953..8da650363 100644 --- a/src/app/patient-dashboard/common/patient-reminders/patient-reminder-custom.component.css +++ b/src/app/patient-dashboard/common/patient-reminders/patient-reminder-custom.component.css @@ -20,3 +20,33 @@ :host.toast.toast-warning { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=') !important; } + +/* Custom toast class for ml custom notification type */ +::ng-deep .ngx-toastr-custom-type { + position: relative; + overflow: hidden; + margin: 0 0 6px; + padding: 15px 15px 15px 50px; + width: 300px; + border-radius: 3px 3px 3px 3px; + background-position: 15px center; + background-repeat: no-repeat; + background-size: 24px; + box-shadow: 0 0 12px #999999; + color: #271e1e; + background-color: #ffff00; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=') !important; +} + +/* Additional styles for toastr */ +.ngx-toastr-custom-type .toast-title { + font-weight: bold; +} + +.ngx-toastr-custom-type .toast-close-button { + position: absolute; + top: 0; + right: 0; + padding: 8px; + cursor: pointer; +} diff --git a/src/app/patient-dashboard/common/patient-reminders/patient-reminder.component.css b/src/app/patient-dashboard/common/patient-reminders/patient-reminder.component.css index b0af0f6c7..cdca47d99 100644 --- a/src/app/patient-dashboard/common/patient-reminders/patient-reminder.component.css +++ b/src/app/patient-dashboard/common/patient-reminders/patient-reminder.component.css @@ -1,3 +1,8 @@ patient-reminders .panel-body { padding: 0px !important; } + +:host.toast.alert-ml { + background-color: #ffff00; + border-color: #bdaaad; +} diff --git a/src/app/patient-dashboard/common/patient-reminders/patient-reminders.component.ts b/src/app/patient-dashboard/common/patient-reminders/patient-reminders.component.ts index 2c879f7b5..b5d2c0eb0 100644 --- a/src/app/patient-dashboard/common/patient-reminders/patient-reminders.component.ts +++ b/src/app/patient-dashboard/common/patient-reminders/patient-reminders.component.ts @@ -136,7 +136,15 @@ export class PatientRemindersComponent implements OnInit, OnDestroy { this.toastrConfig ); } - + if (reminder.type === 'ml') { + toast = this.toastrService.show(reminder.message, reminder.title, { + extendedTimeOut: 0, + timeOut: 0, + positionClass: 'toast-bottom-right', + closeButton: true, + toastClass: 'ngx-toastr-custom-type' + }); + } if (reminder.type === 'info') { toast = this.toastrService.info( reminder.message, diff --git a/src/app/patient-dashboard/common/patient-reminders/patient-reminders.components.html b/src/app/patient-dashboard/common/patient-reminders/patient-reminders.components.html index 2331b28d7..a0b69ee7d 100644 --- a/src/app/patient-dashboard/common/patient-reminders/patient-reminders.components.html +++ b/src/app/patient-dashboard/common/patient-reminders/patient-reminders.components.html @@ -45,4 +45,18 @@ > {{reminder.message}}

+
+ × + {{reminder.message}} +