diff --git a/i18n/appointments/locale_en.json b/i18n/appointments/locale_en.json index 893540e172..3ba1c95936 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 76441dd0a8..fdb277c6d6 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 4d3629582f..b9f66b5ea7 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 635723e95c..fa27aea3a8 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 188c18d685..73d3ad3e10 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', 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 8b1d790052..d42625d028 100644 --- a/src/views/manage/list/listView.html +++ b/src/views/manage/list/listView.html @@ -29,6 +29,13 @@ {{::appointment.patient.identifier}} {{::appointment.patient.name | titleCase}} + {{::appointment.patient.age}} + {{::appointment.patient.gender}} + +

+ {{auxiliary_identifiers}} +

+ {{::appointment.startDateTime | bahmniDate}} {{::appointment.startDateTime | bahmniTime}} {{::appointment.endDateTime | bahmniTime}} diff --git a/test/controllers/manage/list/appointmentsListViewController.spec.js b/test/controllers/manage/list/appointmentsListViewController.spec.js index ea925af8b6..1196e449be 100644 --- a/test/controllers/manage/list/appointmentsListViewController.spec.js +++ b/test/controllers/manage/list/appointmentsListViewController.spec.js @@ -710,6 +710,9 @@ 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_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}, diff --git a/ui/i18n/appointments/locale_en.json b/ui/i18n/appointments/locale_en.json index aa304d4f4f..76bf36b092 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 2a97d1133d..8c0625fc95 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 5549dec66d..96e3029601 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 12bba7d86d..55246deb87 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",