- Encounter Type |
Encounter Type |
Encounter Date |
RTC Date |
Days Missed |
- Days Missed |
Medication Pick up Date |
ARV Meds |
CD4 Count |
Viral Load |
WHO Stage |
Status |
- Status |
EAC |
@@ -27,7 +24,6 @@
hivSummary.prev_rtc_date < hivSummary.encounter_datetime
}"
>
- {{ hivSummary.encounter_type_name }} |
{{ hivSummary.encounter_type_name }} |
{{ hivSummary.encounter_datetime | date: 'dd-MM-yyyy' }} |
{{ hivSummary.rtc_date | date: 'dd-MM-yyyy' }} |
@@ -42,24 +38,11 @@
}}
-
- {{
- (hivSummary.encounter_datetime - hivSummary.prev_rtc_date) /
- (1000 * 60 * 60 * 24) >
- 0
- ? (hivSummary.encounter_datetime - hivSummary.prev_rtc_date) /
- (1000 * 60 * 60 * 24)
- : 0
- }}
- |
-
{{ hivSummary.med_pickup_rtc_date | date: 'dd-MM-yyyy' }}
|
-
{{ hivSummary.cur_arv_meds }} |
{{ hivSummary.cd4_1 }}
diff --git a/src/app/patient-dashboard/hiv/hiv-summary/medication-history.component.html b/src/app/patient-dashboard/hiv/hiv-summary/medication-history.component.html
index a9e7aeaaf..e7650db95 100644
--- a/src/app/patient-dashboard/hiv/hiv-summary/medication-history.component.html
+++ b/src/app/patient-dashboard/hiv/hiv-summary/medication-history.component.html
@@ -2,19 +2,14 @@
- Change Date |
Change Date |
Previous VL |
Previous Vl Date |
DST |
DST Date |
- DST |
- DST Date |
Current Regimen |
ARV Line |
Reason |
- ARV Line |
- Reason |
@@ -23,6 +18,8 @@
{{ encounter.previous_vl_date }} |
{{ (encounter.previousViralLoad | zeroVl) || ' ' }} |
{{ encounter.previous_vl_date }} |
+ {{ (encounter.previousViralLoad | zeroVl) || ' ' }} |
+ {{ encounter.previous_vl_date }} |
{{ encounter.current_regimen || ' ' }} |
{{ encounter.cur_arv_line || ' ' }} |
{{ encounter.reason_for_regimen_change || ' ' }} |
From de604064eb0da845eeca3dfacc2e12ddee5d03d9 Mon Sep 17 00:00:00 2001
From: Faith Kamau <121166087+hiqedme@users.noreply.github.com>
Date: Wed, 16 Aug 2023 12:49:41 +0300
Subject: [PATCH 25/33] POC-475: added patient tracker
---
.../hiv/hiv-summary/hiv-summary-historical.component.ts | 1 -
.../hiv/hiv-summary/medication-history.component.html | 7 +++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/app/patient-dashboard/hiv/hiv-summary/hiv-summary-historical.component.ts b/src/app/patient-dashboard/hiv/hiv-summary/hiv-summary-historical.component.ts
index 867988da1..1c96dec95 100644
--- a/src/app/patient-dashboard/hiv/hiv-summary/hiv-summary-historical.component.ts
+++ b/src/app/patient-dashboard/hiv/hiv-summary/hiv-summary-historical.component.ts
@@ -108,7 +108,6 @@ export class HivSummaryHistoricalComponent implements OnInit, OnDestroy {
const startDate = Moment(encounter_date, 'YYYY-MM-DD');
const endDate = Moment(prev_rtc, 'YYYY-MM-DD');
const specificDate = Moment('2005-01-01');
- console.log('Data', data);
if (endDate < specificDate) {
this.showMissedDays = false;
diff --git a/src/app/patient-dashboard/hiv/hiv-summary/medication-history.component.html b/src/app/patient-dashboard/hiv/hiv-summary/medication-history.component.html
index e7650db95..0e979ea50 100644
--- a/src/app/patient-dashboard/hiv/hiv-summary/medication-history.component.html
+++ b/src/app/patient-dashboard/hiv/hiv-summary/medication-history.component.html
@@ -16,10 +16,9 @@
{{ encounter.encounter_datetime }} |
{{ (encounter.previousViralLoad | zeroVl) || ' ' }} |
{{ encounter.previous_vl_date }} |
- {{ (encounter.previousViralLoad | zeroVl) || ' ' }} |
- {{ encounter.previous_vl_date }} |
- {{ (encounter.previousViralLoad | zeroVl) || ' ' }} |
- {{ encounter.previous_vl_date }} |
+
+ {{ ' ' }} |
+ {{ ' ' }} |
{{ encounter.current_regimen || ' ' }} |
{{ encounter.cur_arv_line || ' ' }} |
{{ encounter.reason_for_regimen_change || ' ' }} |
From 4f7a561b83d1701462a9a59d0a72d8ea9f36231f Mon Sep 17 00:00:00 2001
From: Angie-540
Date: Mon, 9 Oct 2023 08:49:06 +0300
Subject: [PATCH 26/33] uniquedates
---
.../ahd-events-summary.component.html | 6 +++---
.../ahd-events-summary.component.ts | 12 ++++++------
.../hiv-summary/hiv-summary-historical.component.ts | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/app/patient-dashboard/hiv/hiv-summary/ahd-events-summary/ahd-events-summary.component.html b/src/app/patient-dashboard/hiv/hiv-summary/ahd-events-summary/ahd-events-summary.component.html
index 0520cc77f..f524f25ce 100644
--- a/src/app/patient-dashboard/hiv/hiv-summary/ahd-events-summary/ahd-events-summary.component.html
+++ b/src/app/patient-dashboard/hiv/hiv-summary/ahd-events-summary/ahd-events-summary.component.html
@@ -7,10 +7,10 @@
TB End Date |
-
+
- {{ ahd?.tb_tx_start_date | date: 'dd-MM-yyyy' }} |
- {{ ahd?.tb_tx_end_date | date: 'dd-MM-yyyy' }} |
+ {{ uniqueDates[0] | date: 'dd-MM-yyyy' }} |
+ {{ uniqueDates[0] | date: 'dd-MM-yyyy' }} |
- | {{ uniqueDates[0] | date: 'dd-MM-yyyy' }} |
- {{ uniqueDates[0] | date: 'dd-MM-yyyy' }} |
+
+ {{ startDate | date: 'dd-MM-yyyy' }} |
+ {{ endDate | date: 'dd-MM-yyyy' }} |
-
-