AP-84-V2 - Added test translation and place in default template

Bahmni · Oct 11, 2022 · ce11a20 · ce11a20
1 parent 1c8374a
commit ce11a20
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",