From 3e967b81c4bbbd3fd5a5ab3bf4d8bdd538458cb9 Mon Sep 17 00:00:00 2001
From: icrc-toliveira <toliveira@icrc.org>
Date: Mon, 5 Sep 2022 14:22:25 +0100
Subject: [PATCH 1/3] AP-84-V2 - Added table headers for
 APPOINTMENT_PATIENT_AGE, APPOINTMENT_PATIENT_GENDER and
 APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER

---
 src/controllers/manage/list/appointmentsListViewController.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/controllers/manage/list/appointmentsListViewController.js b/src/controllers/manage/list/appointmentsListViewController.js
index 188c18d68..e0e2f2a6c 100644
--- a/src/controllers/manage/list/appointmentsListViewController.js
+++ b/src/controllers/manage/list/appointmentsListViewController.js
@@ -32,6 +32,9 @@ angular.module('bahmni.appointments')
             });
             $scope.tableInfo = [{heading: 'APPOINTMENT_PATIENT_ID', sortInfo: 'patient.identifier', enable: true},
                 {heading: 'APPOINTMENT_PATIENT_NAME', sortInfo: 'patient.name', class: true, enable: true},
+                {heading: 'APPOINTMENT_PATIENT_AGE', sortInfo: 'patient.age', class: true, enable: true},
+                {heading: 'APPOINTMENT_PATIENT_GENDER', sortInfo: 'patient.gender', class: true, enable: true},
+                {heading: 'APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER', class: true, enable: true},
                 {heading: 'APPOINTMENT_DATE', sortInfo: 'date', enable: true},
                 {heading: 'APPOINTMENT_START_TIME_KEY', sortInfo: 'startDateTime', enable: true},
                 {heading: 'APPOINTMENT_END_TIME_KEY', sortInfo: 'endDateTime', enable: true},

From 1c8374a7183912635751fea2136d1343aa7ee719 Mon Sep 17 00:00:00 2001
From: icrc-toliveira <toliveira@icrc.org>
Date: Tue, 6 Sep 2022 12:12:07 +0100
Subject: [PATCH 2/3] AP-84-V2 - Added test support for table headers for
 APPOINTMENT_PATIENT_AGE, APPOINTMENT_PATIENT_GENDER and
 APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER

---
 .../manage/list/appointmentsListViewController.spec.js     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/controllers/manage/list/appointmentsListViewController.spec.js b/test/controllers/manage/list/appointmentsListViewController.spec.js
index ea925af8b..3bd85de64 100644
--- a/test/controllers/manage/list/appointmentsListViewController.spec.js
+++ b/test/controllers/manage/list/appointmentsListViewController.spec.js
@@ -709,8 +709,11 @@ describe('AppointmentsListViewController', function () {
 
         it("should have table info", function () {
             var tableInfo = [{heading: 'APPOINTMENT_PATIENT_ID', sortInfo: 'patient.identifier', enable: true},
-                {heading: 'APPOINTMENT_PATIENT_NAME', sortInfo: 'patient.name', class: true, enable: true},
-                {heading: 'APPOINTMENT_DATE', sortInfo: 'date', enable: true},
+                {heading: 'APPOINTMENT_PATIENT_NAME', sortInfo: 'patient.name', class: true, enable: true},   
+                {heading: 'APPOINTMENT_PATIENT_AGE', sortInfo: 'patient.age', class: true, enable: true},
+                {heading: 'APPOINTMENT_PATIENT_GENDER', sortInfo: 'patient.gender', class: true, enable: true},
+                {heading: 'APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER', class: true, enable: true},
+                {heading: 'APPOINTMENT_DATE', sortInfo: 'date', enable: true},           
                 {heading: 'APPOINTMENT_START_TIME_KEY', sortInfo: 'startDateTime', enable: true},
                 {heading: 'APPOINTMENT_END_TIME_KEY', sortInfo: 'endDateTime', enable: true},
                 {heading: 'APPOINTMENT_PROVIDER', sortInfo: 'provider.name', class: true, enable: true},

From ce11a20add39369603cf6dc7fd5f449d853f6929 Mon Sep 17 00:00:00 2001
From: icrc-toliveira <toliveira@icrc.org>
Date: Tue, 11 Oct 2022 14:17:52 +0100
Subject: [PATCH 3/3] AP-84-V2 - Added test translation and place in default
 template

---
 i18n/appointments/locale_en.json                           | 3 +++
 i18n/appointments/locale_es.json                           | 3 +++
 i18n/appointments/locale_fr.json                           | 3 +++
 i18n/appointments/locale_pt_BR.json                        | 3 +++
 .../manage/list/appointmentsListViewController.js          | 2 +-
 src/views/manage/list/listView.html                        | 7 +++++++
 .../manage/list/appointmentsListViewController.spec.js     | 4 ++--
 ui/i18n/appointments/locale_en.json                        | 3 +++
 ui/i18n/appointments/locale_es.json                        | 3 +++
 ui/i18n/appointments/locale_fr.json                        | 3 +++
 ui/i18n/appointments/locale_pt_BR.json                     | 3 +++
 11 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/i18n/appointments/locale_en.json b/i18n/appointments/locale_en.json
index 893540e17..3ba1c9593 100644
--- a/i18n/appointments/locale_en.json
+++ b/i18n/appointments/locale_en.json
@@ -101,6 +101,9 @@
   "APPOINTMENT_CREATE_OUTOF": "out of",
   "APPOINTMENT_PATIENT_ID": "Patient ID",
   "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_PATIENT_AGE": "Patient Age",
+  "APPOINTMENT_PATIENT_GENDER": "Patient Gender",
+  "APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER": "Patient Auxiliary Identifier",
   "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
   "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
   "APPOINTMENT_WALK_IN": "Walk In",
diff --git a/i18n/appointments/locale_es.json b/i18n/appointments/locale_es.json
index 76441dd0a..fdb277c6d 100644
--- a/i18n/appointments/locale_es.json
+++ b/i18n/appointments/locale_es.json
@@ -100,6 +100,9 @@
   "APPOINTMENT_CREATE_OUTOF": "out of",
   "APPOINTMENT_PATIENT_ID": "Patient ID",
   "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_PATIENT_AGE": "Patient Age",
+  "APPOINTMENT_PATIENT_GENDER": "Patient Gender",
+  "APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER": "Patient Auxiliary Identifier",
   "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
   "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
   "APPOINTMENT_WALK_IN": "Walk In",
diff --git a/i18n/appointments/locale_fr.json b/i18n/appointments/locale_fr.json
index 4d3629582..b9f66b5ea 100644
--- a/i18n/appointments/locale_fr.json
+++ b/i18n/appointments/locale_fr.json
@@ -101,6 +101,9 @@
   "APPOINTMENT_CREATE_OUTOF": "out of",
   "APPOINTMENT_PATIENT_ID": "Patient ID",
   "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_PATIENT_AGE": "Patient Age",
+  "APPOINTMENT_PATIENT_GENDER": "Patient Gender",
+  "APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER": "Patient Auxiliary Identifier",
   "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
   "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
   "APPOINTMENT_WALK_IN": "Walk In",
diff --git a/i18n/appointments/locale_pt_BR.json b/i18n/appointments/locale_pt_BR.json
index 635723e95..fa27aea3a 100644
--- a/i18n/appointments/locale_pt_BR.json
+++ b/i18n/appointments/locale_pt_BR.json
@@ -100,6 +100,9 @@
   "APPOINTMENT_CREATE_OUTOF": "out of",
   "APPOINTMENT_PATIENT_ID": "Patient ID",
   "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_PATIENT_AGE": "Patient Age",
+  "APPOINTMENT_PATIENT_GENDER": "Patient Gender",
+  "APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER": "Patient Auxiliary Identifier",
   "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
   "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
   "APPOINTMENT_WALK_IN": "Walk In",
diff --git a/src/controllers/manage/list/appointmentsListViewController.js b/src/controllers/manage/list/appointmentsListViewController.js
index e0e2f2a6c..73d3ad3e1 100644
--- a/src/controllers/manage/list/appointmentsListViewController.js
+++ b/src/controllers/manage/list/appointmentsListViewController.js
@@ -34,7 +34,7 @@ angular.module('bahmni.appointments')
                 {heading: 'APPOINTMENT_PATIENT_NAME', sortInfo: 'patient.name', class: true, enable: true},
                 {heading: 'APPOINTMENT_PATIENT_AGE', sortInfo: 'patient.age', class: true, enable: true},
                 {heading: 'APPOINTMENT_PATIENT_GENDER', sortInfo: 'patient.gender', class: true, enable: true},
-                {heading: 'APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER', class: true, enable: true},
+                {heading: 'APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER', sortInfo: 'auxiliary_identifiers', class: true, enable: true},
                 {heading: 'APPOINTMENT_DATE', sortInfo: 'date', enable: true},
                 {heading: 'APPOINTMENT_START_TIME_KEY', sortInfo: 'startDateTime', enable: true},
                 {heading: 'APPOINTMENT_END_TIME_KEY', sortInfo: 'endDateTime', enable: true},
diff --git a/src/views/manage/list/listView.html b/src/views/manage/list/listView.html
index 8b1d79005..d42625d02 100644
--- a/src/views/manage/list/listView.html
+++ b/src/views/manage/list/listView.html
@@ -29,6 +29,13 @@
                     <span ng-hide="shouldShowAppointmentsListPatientLink">{{::appointment.patient.identifier}}</span>
                 </td>
                 <td class="table-mid-width">{{::appointment.patient.name | titleCase}}</td>
+                <td class="table-mid-width">{{::appointment.patient.age}}</td>
+                <td class="table-mid-width">{{::appointment.patient.gender}}</td>
+                <td class="table-mid-width">
+                    <p ng-repeat="auxiliary_identifiers in appointment.patient.auxiliary_identifiers">
+                        {{auxiliary_identifiers}}
+                    </p>
+                </td>
                 <td>{{::appointment.startDateTime | bahmniDate}}</td>
                 <td>{{::appointment.startDateTime | bahmniTime}}</td>
                 <td>{{::appointment.endDateTime | bahmniTime}}</td>
diff --git a/test/controllers/manage/list/appointmentsListViewController.spec.js b/test/controllers/manage/list/appointmentsListViewController.spec.js
index 3bd85de64..1196e449b 100644
--- a/test/controllers/manage/list/appointmentsListViewController.spec.js
+++ b/test/controllers/manage/list/appointmentsListViewController.spec.js
@@ -709,11 +709,11 @@ describe('AppointmentsListViewController', function () {
 
         it("should have table info", function () {
             var tableInfo = [{heading: 'APPOINTMENT_PATIENT_ID', sortInfo: 'patient.identifier', enable: true},
-                {heading: 'APPOINTMENT_PATIENT_NAME', sortInfo: 'patient.name', class: true, enable: true},   
+                {heading: 'APPOINTMENT_PATIENT_NAME', sortInfo: 'patient.name', class: true, enable: true},
                 {heading: 'APPOINTMENT_PATIENT_AGE', sortInfo: 'patient.age', class: true, enable: true},
                 {heading: 'APPOINTMENT_PATIENT_GENDER', sortInfo: 'patient.gender', class: true, enable: true},
                 {heading: 'APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER', class: true, enable: true},
-                {heading: 'APPOINTMENT_DATE', sortInfo: 'date', enable: true},           
+                {heading: 'APPOINTMENT_DATE', sortInfo: 'date', enable: true},
                 {heading: 'APPOINTMENT_START_TIME_KEY', sortInfo: 'startDateTime', enable: true},
                 {heading: 'APPOINTMENT_END_TIME_KEY', sortInfo: 'endDateTime', enable: true},
                 {heading: 'APPOINTMENT_PROVIDER', sortInfo: 'provider.name', class: true, enable: true},
diff --git a/ui/i18n/appointments/locale_en.json b/ui/i18n/appointments/locale_en.json
index aa304d4f4..76bf36b09 100644
--- a/ui/i18n/appointments/locale_en.json
+++ b/ui/i18n/appointments/locale_en.json
@@ -100,6 +100,9 @@
   "APPOINTMENT_CREATE_OUTOF": "out of",
   "APPOINTMENT_PATIENT_ID": "Patient ID",
   "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_PATIENT_AGE": "Patient Age",
+  "APPOINTMENT_PATIENT_GENDER": "Patient Gender",
+  "APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER": "Patient Auxiliary Identifier",
   "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
   "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
   "APPOINTMENT_WALK_IN": "Walk In",
diff --git a/ui/i18n/appointments/locale_es.json b/ui/i18n/appointments/locale_es.json
index 2a97d1133..8c0625fc9 100644
--- a/ui/i18n/appointments/locale_es.json
+++ b/ui/i18n/appointments/locale_es.json
@@ -99,6 +99,9 @@
   "APPOINTMENT_CREATE_OUTOF": "out of",
   "APPOINTMENT_PATIENT_ID": "Patient ID",
   "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_PATIENT_AGE": "Patient Age",
+  "APPOINTMENT_PATIENT_GENDER": "Patient Gender",
+  "APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER": "Patient Auxiliary Identifier",
   "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
   "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
   "APPOINTMENT_WALK_IN": "Walk In",
diff --git a/ui/i18n/appointments/locale_fr.json b/ui/i18n/appointments/locale_fr.json
index 5549dec66..96e302960 100644
--- a/ui/i18n/appointments/locale_fr.json
+++ b/ui/i18n/appointments/locale_fr.json
@@ -99,6 +99,9 @@
   "APPOINTMENT_CREATE_OUTOF": "out of",
   "APPOINTMENT_PATIENT_ID": "Patient ID",
   "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_PATIENT_AGE": "Patient Age",
+  "APPOINTMENT_PATIENT_GENDER": "Patient Gender",
+  "APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER": "Patient Auxiliary Identifier",
   "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
   "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
   "APPOINTMENT_WALK_IN": "Walk In",
diff --git a/ui/i18n/appointments/locale_pt_BR.json b/ui/i18n/appointments/locale_pt_BR.json
index 12bba7d86..55246deb8 100644
--- a/ui/i18n/appointments/locale_pt_BR.json
+++ b/ui/i18n/appointments/locale_pt_BR.json
@@ -99,6 +99,9 @@
   "APPOINTMENT_CREATE_OUTOF": "out of",
   "APPOINTMENT_PATIENT_ID": "Patient ID",
   "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_PATIENT_AGE": "Patient Age",
+  "APPOINTMENT_PATIENT_GENDER": "Patient Gender",
+  "APPOINTMENT_PATIENT_AUXILIARY_IDENTIFIER": "Patient Auxiliary Identifier",
   "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
   "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
   "APPOINTMENT_WALK_IN": "Walk In",