From f8af165d4cd738a59e9da9c3fa81a7d52fba00e2 Mon Sep 17 00:00:00 2001
From: Arthur Kong <arthur.kong@gmail.com>
Date: Tue, 27 Sep 2016 12:47:59 -0700
Subject: [PATCH] =?UTF-8?q?Issue=20661:=20Use=20'Sex=20Not=20Entered'=20fo?=
 =?UTF-8?q?r=20patients=20with=20missing=20gender=20on=20=E2=80=A6=20(#662?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Issue 661: Use 'Sex Not Entered' for patients with missing gender on reports

* Issue 661: move 'Sex Not Entered' to localization file.
---
 app/locales/en/translations.js     |  3 ++-
 app/patients/reports/controller.js | 12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js
index c30f9a5674..5e18fa4d6f 100644
--- a/app/locales/en/translations.js
+++ b/app/locales/en/translations.js
@@ -889,7 +889,8 @@ export default {
       referredDate: 'Referred Date',
       religion: 'Religion',
       parent: 'Parent/Guardian',
-      contacts: 'Contacts'
+      contacts: 'Contacts',
+      sexNotEntered: 'Sex Not Entered'
     },
     notes: {
       newNote: 'New Note for',
diff --git a/app/patients/reports/controller.js b/app/patients/reports/controller.js
index cef7d922f4..4ab58a6d0d 100644
--- a/app/patients/reports/controller.js
+++ b/app/patients/reports/controller.js
@@ -545,7 +545,9 @@ export default AbstractReportController.extend(PatientDiagnosis, PatientVisits,
   _generateAdmissionOrDischargeReport: function(visits, reportType) {
     var detailedReport = false,
       reportColumns,
-      patientBySex = {};
+      patientBySex = {},
+      sexNotEnteredLabel = this.get('i18n').t('patients.labels.sexNotEntered');
+
     if (reportType.indexOf('detailed') > -1) {
       detailedReport = true;
       reportColumns = this.get('admissionDetailReportColumns');
@@ -568,13 +570,17 @@ export default AbstractReportController.extend(PatientDiagnosis, PatientVisits,
           admissionDate: visit.get('startDate'),
           dischargeDate: visit.get('endDate')
         };
-        var sexGrouping = patientBySex[visit.get('patient.sex')];
+        var sex = visit.get('patient.sex');
+        if (!sex) {
+          sex = sexNotEnteredLabel;
+        }
+        var sexGrouping = patientBySex[sex];
         if (!sexGrouping) {
           sexGrouping = {
             count: 0,
             rows: []
           };
-          patientBySex[visit.get('patient.sex')] = sexGrouping;
+          patientBySex[sex] = sexGrouping;
         }
         sexGrouping.count++;
         sexGrouping.rows.push(reportRow);