Date: Fri, 19 May 2023 12:42:19 +0300
Subject: [PATCH 05/22] POC-145: UI
---
.../locator-map-details.component.css | 9 +++++
.../locator-map-details.component.html | 39 ++++++++++++++++---
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css
index e69de29bb..6a403249d 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css
@@ -0,0 +1,9 @@
+.patient-info-row {
+ margin-right: 0px;
+ margin-left: 0px;
+}
+
+.info_section_title {
+ font-size: 20px;
+ color: #203864;
+}
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
index 16eed3e30..99a37e65a 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
@@ -1,6 +1,35 @@
-
- locator-map-details works!
-
+
+
Locator Map Details
+
+
+
+
+
+
+ |
+ |
+
+
+
+
+ | Landmark : Landmark |
+ Workplace : Eldoret MTRH |
+
+
+
+ | Contact Phone Number : 0722001222 |
+ Treatment Supporter Name : Test supporter |
+
+
+ | Well Known child Name : Jeniffer |
+ Alternative Contact : 0711000000 |
+
+
+
+
+
+
+
+
+
+ Done! {{ successAlert }}
+
+
+ {{ errorTitle }} {{ errorAlert }}
+
+
+
+
+
+
+
-->
+
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 46b9f26b4..6cad99020 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,6 +16,10 @@ 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;
@@ -39,7 +43,25 @@ export class LocatorMapComponent implements OnInit, OnDestroy {
private personResourceService: PersonResourceService
) {}
- public ngOnInit() {
+ public ngOnInit(): void {}
+
+ public ngOnDestroy(): void {}
+
+ public showDialog(param, id) {
+ this.identifierValidity = '';
+ if (param === 'edit' && id) {
+ this.display = true;
+ this.initIdentifier(id);
+ } else if (param === 'add') {
+ this.addDialog = true;
+ this.dialogData(id);
+ } else if (param === 'verify') {
+ this.addVerifyDialog = true;
+ this.dialogData(id, true);
+ }
+ }
+
+ /*public ngOnInit() {
this.subscriptions.push(
this.patientService.currentlyLoadedPatient.subscribe((patient) => {
if (patient) {
@@ -185,5 +207,5 @@ export class LocatorMapComponent implements OnInit, OnDestroy {
public resetValues(): void {
this.dataModel = null;
this.pdfAvailable = false;
- }
+ } */
}
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map.css b/src/app/patient-dashboard/common/locator-map/locator-map.css
index 7e3aef70e..8de4801e2 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map.css
+++ b/src/app/patient-dashboard/common/locator-map/locator-map.css
@@ -4,3 +4,6 @@ img {
a img {
width: 200px;
}
+.edit-locator-dialog {
+ top: 170px !important;
+}
diff --git a/src/app/patient-dashboard/common/patient-identifier/edit-patient-identifier.component.html b/src/app/patient-dashboard/common/patient-identifier/edit-patient-identifier.component.html
index 0472dba79..afd80ae90 100644
--- a/src/app/patient-dashboard/common/patient-identifier/edit-patient-identifier.component.html
+++ b/src/app/patient-dashboard/common/patient-identifier/edit-patient-identifier.component.html
@@ -328,16 +328,14 @@
header="Add Patient Identifiers"
[(visible)]="addDialog"
closable="true"
- styleClass="edit-identifier-dialog"
->
+ styleClass="edit-identifier-dialog">
+ style="margin-top: 10px">
Done! {{ successAlert }}
Relationships
Outreach Locator Map
+
Add
From 00f1b1c1c81bd85d08baa1bd3854df4f53e13933 Mon Sep 17 00:00:00 2001
From: Faith Kamau <121166087+hiqedme@users.noreply.github.com>
Date: Mon, 22 May 2023 17:11:55 +0300
Subject: [PATCH 08/22] added data to UI
---
.../locator-map-details.component.html | 23 +++---
.../locator-map-details.component.ts | 71 ++++++++++++++++++-
.../patient-info/patient-info.component.html | 8 ++-
3 files changed, 89 insertions(+), 13 deletions(-)
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
index 99a37e65a..9bb317f25 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
@@ -1,10 +1,10 @@
-
+
-
+
|
@@ -13,17 +13,20 @@ Locator Map Details
- | Landmark : Landmark |
- Workplace : Eldoret MTRH |
-
+ Landmark : {{ landmark }} |
+ Workplace : {{ workplace }} |
- | Contact Phone Number : 0722001222 |
- Treatment Supporter Name : Test supporter |
+
+ Well Known Neighbour : {{ nearestNeighbour }}
+ |
+
+ Treatment Supporter Name : {{ treatmentSupporter }}
+ |
- | Well Known child Name : Jeniffer |
- Alternative Contact : 0711000000 |
+ Well Known child Name : {{ knownChild }} |
+ Tribe {{ tribe }} |
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
index d80560edb..46b2c3c7c 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
@@ -1,4 +1,8 @@
import { Component, OnInit } from '@angular/core';
+import { PatientService } from '../../services/patient.service';
+import { PersonAttributeResourceService } from './../../../openmrs-api/person-attribute-resource.service';
+import { Patient } from '../../../models/patient.model';
+import { Subscription } from 'rxjs';
@Component({
selector: 'locator-map-details',
@@ -6,7 +10,70 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./locator-map-details.component.css']
})
export class LocatorMapDetailsComponent implements OnInit {
- constructor() {}
+ public patient: Patient = new Patient({});
- ngOnInit() {}
+ public display = false;
+ public subscription: Subscription;
+ private patient_uuid: string;
+ private tribe: string;
+ private nearestNeighbour: string;
+ private landmark: string;
+ private workplace: string;
+ private knownChild: string;
+ private treatmentSupporter: string;
+ constructor(
+ private patientService: PatientService,
+ private personAttributeResourceService: PersonAttributeResourceService
+ ) {}
+ ngOnInit() {
+ this.subscription = this.patientService.currentlyLoadedPatient.subscribe(
+ (patient) => {
+ this.patient = new Patient({});
+ if (patient) {
+ this.patient = patient;
+ this.getPatientLocation();
+ }
+ }
+ );
+ }
+ public getPatientLocation() {
+ const patientUuid = this.patient.uuid;
+ this.personAttributeResourceService
+ .getPersonAttributesByUuid(patientUuid)
+ .subscribe((res) => {
+ res.results.forEach((a: any) => {
+ console.log(a);
+ if (a.attributeType.uuid === '4dcc4901-d4a1-422a-b6a0-2b24594a0dc6') {
+ this.knownChild = a.value;
+ } else if (
+ a.attributeType.uuid === '254e3b6a-eeec-4714-9c5f-776cc4d30191'
+ ) {
+ this.landmark = a.value;
+ } else if (
+ a.attributeType.uuid === '4dae5b87-884d-4f88-b2fb-85cda2be37d6'
+ ) {
+ this.workplace = a.value;
+ } else if (
+ a.attributeType.uuid === '38f592c5-9e44-4629-8561-c2429bc6062d'
+ ) {
+ this.nearestNeighbour = a.value;
+ } else if (
+ a.attributeType.uuid === '20360c21-2241-47b6-8442-04aa3594544b'
+ ) {
+ this.treatmentSupporter = a.value;
+ } else if (
+ a.attributeType.uuid === 'fb74a24a-13a9-11df-a1f1-0026b9348838'
+ ) {
+ this.tribe = a.value;
+ }
+ });
+ });
+ }
+
+ // tslint:disable-next-line: use-life-cycle-interface
+ public ngOnDestroy(): void {
+ if (this.subscription) {
+ this.subscription.unsubscribe();
+ }
+ }
}
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 cf81a4953..2fce7350d 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
@@ -76,6 +76,13 @@ Relationships
+
+
+
+
Patient Location Details
+
+
+
@@ -83,5 +90,4 @@
Relationships
Outreach Locator Map
-
From ec2f4436fb7e97ecc183f0314adb9a91fb0e2aed Mon Sep 17 00:00:00 2001
From: Angie-540
Date: Tue, 23 May 2023 11:18:08 +0300
Subject: [PATCH 09/22] locator-map add button
---
.../locator-map/locator-map.component.html | 31 +++++--------------
.../locator-map/locator-map.component.ts | 14 ++-------
.../edit-patient-identifier.component.html | 9 ++----
.../patient-identifier.component.html | 4 +--
.../patient-info/patient-info.component.html | 4 +--
.../patient-info/patient-info.component.ts | 1 +
6 files changed, 17 insertions(+), 46 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 a0ec1fe7f..799782558 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,29 +1,12 @@
-
-
-
-
-
- Done! {{ successAlert }}
-
-
- {{ errorTitle }} {{ errorAlert }}
-
-
-
-
Identifiers
+
+
-
-
-
-
Patient Location Details
-
-
-
+
-
Outreach Locator Map
+
Patient Location Details
Add
+ class="edit_link"
+ >
Add
+
+
+
+ View
+
+
+
+
+
+
From da6024edc85202440e919f6ce3b22d0f284192eb Mon Sep 17 00:00:00 2001
From: Faith Kamau <121166087+hiqedme@users.noreply.github.com>
Date: Tue, 23 May 2023 16:55:28 +0300
Subject: [PATCH 11/22] added view and edit buttons
---
.../locator-map-details.component.html | 15 +++--
.../locator-map-details.component.ts | 60 ++++++++++++++++++-
.../patient-info/patient-info.component.html | 6 +-
3 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
index 9bb317f25..bb456ed26 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
@@ -2,7 +2,14 @@
-
+
@@ -32,7 +39,7 @@ Locator Map Details
-
+
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
index 46b2c3c7c..ac3759fe4 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
@@ -3,7 +3,10 @@ import { PatientService } from '../../services/patient.service';
import { PersonAttributeResourceService } from './../../../openmrs-api/person-attribute-resource.service';
import { Patient } from '../../../models/patient.model';
import { Subscription } from 'rxjs';
-
+import { Router } from '@angular/router';
+import { take } from 'rxjs/operators';
+import { EncounterResourceService } from 'src/app/openmrs-api/encounter-resource.service';
+import * as _ from 'lodash';
@Component({
selector: 'locator-map-details',
templateUrl: './locator-map-details.component.html',
@@ -14,6 +17,10 @@ export class LocatorMapDetailsComponent implements OnInit {
public display = false;
public subscription: Subscription;
+ public patientLocatorEncounterUuid: string;
+ public patientLocatorEncounter: any;
+ public editDetails = false;
+ public patientEncounters: Array = [];
private patient_uuid: string;
private tribe: string;
private nearestNeighbour: string;
@@ -21,9 +28,12 @@ export class LocatorMapDetailsComponent implements OnInit {
private workplace: string;
private knownChild: string;
private treatmentSupporter: string;
+ private locatorMapFormUuid = '18992298-4fe3-4c77-af9c-df8cf31b6e2b';
constructor(
private patientService: PatientService,
- private personAttributeResourceService: PersonAttributeResourceService
+ private personAttributeResourceService: PersonAttributeResourceService,
+ private router: Router,
+ private encounterResourceService: EncounterResourceService
) {}
ngOnInit() {
this.subscription = this.patientService.currentlyLoadedPatient.subscribe(
@@ -32,6 +42,7 @@ export class LocatorMapDetailsComponent implements OnInit {
if (patient) {
this.patient = patient;
this.getPatientLocation();
+ this.getPatientEncounters();
}
}
);
@@ -42,7 +53,6 @@ export class LocatorMapDetailsComponent implements OnInit {
.getPersonAttributesByUuid(patientUuid)
.subscribe((res) => {
res.results.forEach((a: any) => {
- console.log(a);
if (a.attributeType.uuid === '4dcc4901-d4a1-422a-b6a0-2b24594a0dc6') {
this.knownChild = a.value;
} else if (
@@ -69,6 +79,50 @@ export class LocatorMapDetailsComponent implements OnInit {
});
});
}
+ public fillLocatorDetails() {
+ const patientUuid = this.patient.uuid;
+
+ if (patientUuid === undefined || patientUuid === null) {
+ return;
+ }
+
+ if (this.patientEncounters.length > 0) {
+ const url = `/patient-dashboard/patient/${patientUuid}/general/general/formentry/${this.locatorMapFormUuid}`;
+ this.router.navigate([url], {
+ queryParams: {
+ encounter: this.patientLocatorEncounterUuid,
+ visitTypeUuid: ''
+ }
+ });
+ } else {
+ this.router.navigate([
+ '/patient-dashboard/patient/' +
+ patientUuid +
+ '/general/general/formentry/' +
+ this.locatorMapFormUuid
+ ]);
+ }
+ }
+
+ public getPatientEncounters() {
+ this.encounterResourceService
+ .getEncountersByPatientUuid(this.patient.uuid, false, null)
+ .pipe(take(1))
+ .subscribe((resp) => {
+ this.patientEncounters = resp.reverse().filter((encounter) => {
+ if (encounter.form) {
+ return encounter.form.uuid === this.locatorMapFormUuid;
+ }
+ });
+ if (this.patientEncounters.length > 0) {
+ this.editDetails = true;
+ this.patientLocatorEncounter = _.first(this.patientEncounters);
+ this.patientLocatorEncounterUuid = _.first(
+ this.patientEncounters
+ ).uuid;
+ }
+ });
+ }
// tslint:disable-next-line: use-life-cycle-interface
public ngOnDestroy(): void {
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 2fce7350d..75b8fdc5f 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
@@ -84,10 +84,10 @@ Patient Location Details
-
+
+
From cfeb69c213a1283b00b5fcbef45f1885a464e7e3 Mon Sep 17 00:00:00 2001
From: Faith Kamau <121166087+hiqedme@users.noreply.github.com>
Date: Wed, 24 May 2023 09:33:27 +0300
Subject: [PATCH 12/22] added view
---
.../pretty-encounter-viewer.component.html | 3 +++
.../locator-map-details.component.html | 21 ++++++++++++-------
.../locator-map-details.component.ts | 11 +++++++++-
.../patient-info/patient-info.component.html | 17 +++++----------
4 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/app/patient-dashboard/common/formentry/pretty-encounter-viewer.component.html b/src/app/patient-dashboard/common/formentry/pretty-encounter-viewer.component.html
index 6b0e1021e..4ef8b9b81 100644
--- a/src/app/patient-dashboard/common/formentry/pretty-encounter-viewer.component.html
+++ b/src/app/patient-dashboard/common/formentry/pretty-encounter-viewer.component.html
@@ -13,3 +13,6 @@
{{ loaderText }}
+
+
+
\ No newline at end of file
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
index 08107ff19..15c609354 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
@@ -1,7 +1,14 @@
-
-
+
+
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
index 3bef1d1c0..a816dab3b 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, EventEmitter, Output } from '@angular/core';
import { PatientService } from '../../services/patient.service';
import { PersonAttributeResourceService } from './../../../openmrs-api/person-attribute-resource.service';
import { PrettyEncounterViewerComponent } from '../patient-dashboard/common/formentry/pretty-encounter-viewer.component';
@@ -16,12 +16,15 @@ import * as _ from 'lodash';
})
export class LocatorMapDetailsComponent implements OnInit {
public patient: Patient = new Patient({});
+
public display = false;
public subscription: Subscription;
public patientLocatorEncounterUuid: string;
public patientLocatorEncounter: any;
public editDetails = false;
public patientEncounters: Array
= [];
+ public isBusy = new EventEmitter();
+ public onShowPrettyEncounterViewer = new EventEmitter();
private patient_uuid: string;
private tribe: string;
private nearestNeighbour: string;
@@ -36,6 +39,11 @@ export class LocatorMapDetailsComponent implements OnInit {
private router: Router,
private encounterResourceService: EncounterResourceService
) {}
+ public showDialog(encounter: any) {
+ this.display = true;
+ this.isBusy.emit(true);
+ this.onShowPrettyEncounterViewer.emit(encounter);
+ }
ngOnInit() {
this.subscription = this.patientService.currentlyLoadedPatient.subscribe(
(patient) => {
@@ -48,6 +56,7 @@ export class LocatorMapDetailsComponent implements OnInit {
}
);
}
+
public getPatientLocation() {
const patientUuid = this.patient.uuid;
this.personAttributeResourceService
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 5cc646412..e50b385d5 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
@@ -1,3 +1,5 @@
+
+
Patient Information
@@ -84,20 +86,11 @@ Relationships
From 524e0d6d9df6b265d2b1c96428b1d93e7b656dfe Mon Sep 17 00:00:00 2001
From: Angie-540
Date: Wed, 24 May 2023 17:04:08 +0300
Subject: [PATCH 13/22] add view button
---
.../locator-map-details.component.css | 20 ++++++++++++++
.../locator-map-details.component.html | 26 ++++++++++++++-----
.../locator-map-details.component.ts | 16 ++++++++----
.../patient-info/patient-info.component.html | 4 +--
4 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css
index 6a403249d..9f01f9de2 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css
@@ -7,3 +7,23 @@
font-size: 20px;
color: #203864;
}
+.edit_link span {
+ font-size: 1.1em;
+}
+.edit_link .fa {
+ display: inline;
+}
+.edit_link:hover {
+ cursor: pointer;
+}
+.spacing {
+ margin-right: 10px;
+}
+.smaller-icon {
+ font-size: 12px;
+}
+.modal {
+ top: 20%;
+ left: 20%;
+ max-height: 80vh;
+}
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
index 15c609354..3428cce5e 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
@@ -1,14 +1,24 @@
-
-
+
+
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
index a816dab3b..31844965f 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, EventEmitter, Output } from '@angular/core';
+import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core';
import { PatientService } from '../../services/patient.service';
import { PersonAttributeResourceService } from './../../../openmrs-api/person-attribute-resource.service';
import { PrettyEncounterViewerComponent } from '../patient-dashboard/common/formentry/pretty-encounter-viewer.component';
@@ -23,8 +23,9 @@ export class LocatorMapDetailsComponent implements OnInit {
public patientLocatorEncounter: any;
public editDetails = false;
public patientEncounters: Array = [];
- public isBusy = new EventEmitter();
- public onShowPrettyEncounterViewer = new EventEmitter();
+ @Output() public isBusy = new EventEmitter();
+ @Output() public ShowPrettyEncounterViewer = new EventEmitter();
+ @Output() public EncounterObservations = new EventEmitter();
private patient_uuid: string;
private tribe: string;
private nearestNeighbour: string;
@@ -39,10 +40,15 @@ export class LocatorMapDetailsComponent implements OnInit {
private router: Router,
private encounterResourceService: EncounterResourceService
) {}
- public showDialog(encounter: any) {
+
+ public showDialog() {
+ this.display = true;
+ }
+ public showEncounterObservations(encounter) {
this.display = true;
this.isBusy.emit(true);
- this.onShowPrettyEncounterViewer.emit(encounter);
+ this.EncounterObservations.emit(encounter);
+ // console.log('Show observations', encounter);
}
ngOnInit() {
this.subscription = this.patientService.currentlyLoadedPatient.subscribe(
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 e50b385d5..307810553 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
@@ -89,8 +89,8 @@ Patient Location Details
From 16a1532b9799a9307f74ad8a75e22fa916a89adc Mon Sep 17 00:00:00 2001
From: Angie-540
Date: Thu, 25 May 2023 08:48:43 +0300
Subject: [PATCH 14/22] pop-up
---
.../locator-map/locator-map-details.component.css | 10 +++++++---
.../locator-map/locator-map-details.component.html | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css
index 9f01f9de2..3f0b4bb0f 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.css
@@ -23,7 +23,11 @@
font-size: 12px;
}
.modal {
- top: 20%;
- left: 20%;
- max-height: 80vh;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 60%;
+ height: 600px;
+ justify-content: center;
+ align-items: center;
}
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
index 3428cce5e..637f8594b 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
@@ -57,7 +57,7 @@
From 2a66d1f0e922dd57f5b96ba1d2a5d3cdd05d7370 Mon Sep 17 00:00:00 2001
From: Angie-540
Date: Fri, 26 May 2023 10:22:38 +0300
Subject: [PATCH 15/22] all
---
.../formentry/pretty-encounter-viewer.component.html | 4 ++--
.../common/locator-map/locator-map-details.component.html | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/app/patient-dashboard/common/formentry/pretty-encounter-viewer.component.html b/src/app/patient-dashboard/common/formentry/pretty-encounter-viewer.component.html
index 4ef8b9b81..eb65eb7c4 100644
--- a/src/app/patient-dashboard/common/formentry/pretty-encounter-viewer.component.html
+++ b/src/app/patient-dashboard/common/formentry/pretty-encounter-viewer.component.html
@@ -1,8 +1,8 @@
-
+
+ >
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
index 637f8594b..12e4833ed 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
@@ -1,7 +1,8 @@
-
+
+
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
index 31844965f..292af49ed 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.ts
@@ -1,4 +1,12 @@
-import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core';
+import {
+ Component,
+ OnInit,
+ EventEmitter,
+ Input,
+ Output,
+ ViewChild,
+ ViewEncapsulation
+} from '@angular/core';
import { PatientService } from '../../services/patient.service';
import { PersonAttributeResourceService } from './../../../openmrs-api/person-attribute-resource.service';
import { PrettyEncounterViewerComponent } from '../patient-dashboard/common/formentry/pretty-encounter-viewer.component';
@@ -7,6 +15,8 @@ import { Patient } from '../../../models/patient.model';
import { Subscription } from 'rxjs';
import { Router } from '@angular/router';
import { take } from 'rxjs/operators';
+import { ModalComponent } from 'ng2-bs3-modal/ng2-bs3-modal';
+import { ModalDirective } from 'ngx-bootstrap/modal';
import * as _ from 'lodash';
@Component({
@@ -23,6 +33,10 @@ export class LocatorMapDetailsComponent implements OnInit {
public patientLocatorEncounter: any;
public editDetails = false;
public patientEncounters: Array
= [];
+ @ViewChild('staticModal')
+ public staticModal: ModalDirective;
+ @ViewChild('modal')
+ public modal: ModalComponent;
@Output() public isBusy = new EventEmitter();
@Output() public ShowPrettyEncounterViewer = new EventEmitter();
@Output() public EncounterObservations = new EventEmitter();
@@ -44,6 +58,13 @@ export class LocatorMapDetailsComponent implements OnInit {
public showDialog() {
this.display = true;
}
+ public close() {
+ this.modal.close();
+ }
+ public dismissed() {
+ this.modal.dismiss();
+ }
+
public showEncounterObservations(encounter) {
this.display = true;
this.isBusy.emit(true);
diff --git a/src/app/patient-dashboard/common/patient-encounters/patient-encounter-observations.component.html b/src/app/patient-dashboard/common/patient-encounters/patient-encounter-observations.component.html
index 6f1dc7513..6226c3fc7 100644
--- a/src/app/patient-dashboard/common/patient-encounters/patient-encounter-observations.component.html
+++ b/src/app/patient-dashboard/common/patient-encounters/patient-encounter-observations.component.html
@@ -6,8 +6,8 @@
tabindex="-1"
role="dialog"
aria-labelledby="mySmallModalLabel"
- aria-hidden="true"
->
+ aria-hidden="true">
+
@@ -65,8 +64,8 @@
Observations
+ [encounter]="selectedEncounter">
+
From 45d43e5e764e92035b14de1584f551cd571cd57a Mon Sep 17 00:00:00 2001
From: Angie-540
Date: Tue, 30 May 2023 22:14:27 +0300
Subject: [PATCH 17/22] dismiss modal
---
.../common/locator-map/locator-map-details.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
index a81d5eb43..415a069c0 100644
--- a/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
+++ b/src/app/patient-dashboard/common/locator-map/locator-map-details.component.html
@@ -61,7 +61,7 @@