Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ap 84 - Add "age", "gender" and "patient identifiers" to Patient map #230

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ap 84 - Add "age", "gender" and "patient identifiers" to Patient map #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e967b8
AP-84-V2 - Added table headers for APPOINTMENT_PATIENT_AGE, APPOINTME…
icrc-toliveira Sep 5, 2022
1c8374a
AP-84-V2 - Added test support for table headers for APPOINTMENT_PATIE…
icrc-toliveira Sep 6, 2022
ce11a20
AP-84-V2 - Added test translation and place in default template
icrc-toliveira Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions i18n/appointments/locale_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions i18n/appointments/locale_es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions i18n/appointments/locale_fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions i18n/appointments/locale_pt_BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions src/controllers/manage/list/appointmentsListViewController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
7 changes: 7 additions & 0 deletions src/views/manage/list/listView.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions test/controllers/manage/list/appointmentsListViewController.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
3 changes: 3 additions & 0 deletions ui/i18n/appointments/locale_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions ui/i18n/appointments/locale_es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions ui/i18n/appointments/locale_fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions ui/i18n/appointments/locale_pt_BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down