EPCT-16 Dead patient info details are not being displayed in Visualiz…

…ation (#692) * EPCT-16 Dead patient info details are not being displayed in Visualization * Add missing attributes to patient representation * Update openmrsPatientMapper * Fix template URL * Unit test.
esaude · Jul 19, 2018 · eebdb02 · eebdb02
1 parent 95b3c21
commit eebdb02
Show file tree

Hide file tree

Showing 4 changed files with 663 additions and 9 deletions.
diff --git a/app/common/patient/components/details/patientDeath.js b/app/common/patient/components/details/patientDeath.js
@@ -8,7 +8,7 @@
         patient: '<'
       },
       controllerAs: 'vm',
-      templateUrl: '../common/patient/components/details//patientDeath.html',
+      templateUrl: '../common/patient/components/details/patientDeath.html',
     });
 
 })();
diff --git a/app/common/patient/constants.js b/app/common/patient/constants.js
@@ -42,6 +42,9 @@ Poc.Patient.Constants.Errors = {};
       'Tipo de teste HIV',
     ])
     .constant('patientRepresentation',
-      'custom:(uuid,identifiers:(uuid,display,identifier,preferred,identifierType:(uuid,display,required,formatDescription)),person:(auditInfo,birthdate,birthdateEstimated,gender,preferredAddress,preferredName,attributes:(value,attributeType:(name,format))');
+      'custom:(uuid,dead,deathDate,causeOfDeath,identifiers:(uuid,display,identifier,preferred,' +
+              'identifierType:(uuid,display,required,formatDescription)),' +
+              'person:(auditInfo,birthdate,birthdateEstimated,gender,preferredAddress,preferredName,' +
+                      'attributes:(value,attributeType:(name,format))');
 
 })();
diff --git a/app/common/patient/mappers/openmrsPatientMapper.js b/app/common/patient/mappers/openmrsPatientMapper.js
@@ -19,8 +19,9 @@
     ////////////////
 
     function map(openmrsPatient) {
-      var patient = patientModel.create(),
-        birthdate = parseDate(openmrsPatient.person.birthdate);
+      const patient = patientModel.create(),
+            birthdate = parseDate(openmrsPatient.person.birthdate);
+
       patient.givenName = openmrsPatient.person.preferredName.givenName;
       patient.middleName = openmrsPatient.person.preferredName.middleName;
       patient.familyName = openmrsPatient.person.preferredName.familyName;
@@ -32,11 +33,11 @@
       patient.age = birthdate ? age.fromBirthDate(openmrsPatient.person.birthdate) : null;
       patient.gender = openmrsPatient.person.gender;
       patient.address = mapAddress(openmrsPatient.person.preferredAddress);
-      patient.dead = openmrsPatient.person.dead,
-        patient.causeOfDeath = (openmrsPatient.person.dead === true) ? openmrsPatient.person.causeOfDeath : null,
-        patient.deathDate = (openmrsPatient.person.dead === true) ? openmrsPatient.person.deathDate : null,
-        //TODO: must get the identifier to display from openmrs configurations
-        patient.identifier = openmrsPatient.identifiers[0].identifier;
+      patient.dead = openmrsPatient.dead;
+      patient.causeOfDeath = (openmrsPatient.dead === true) ? openmrsPatient.causeOfDeath : null;
+      patient.deathDate = (openmrsPatient.dead === true) ? openmrsPatient.deathDate : null;
+      //TODO: must get the identifier to display from openmrs configurations
+      patient.identifier = openmrsPatient.identifiers[0].identifier;
       patient.identifierType = openmrsPatient.identifiers[0].identifierType.display;
       patient.image = Poc.Patient.Constants.patientImageURL + openmrsPatient.uuid + ".jpeg?q=" + new Date().toISOString();
       patient.registrationDate = parseDate(openmrsPatient.person.auditInfo.dateCreated);