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

Orbithealth master #50

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

Orbithealth master #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
05866a2
localization and registration chnages
Aug 7, 2020
d509406
Merge pull request #1 from Orbithealth/dev_sinte
henoksolomongiz Aug 7, 2020
edfcea7
hide bacteriology tab from consultaion page
betsegaw-degefe Aug 14, 2020
b612ab8
registration chnage
Aug 14, 2020
73df7a5
Merge branch 'orbithealth-dev-betsegaw' into orbithealth-master
betsegaw-degefe Aug 14, 2020
871fa2f
registration print
Aug 14, 2020
3d1e64d
appointment module localized
betsegaw-degefe Aug 14, 2020
d569921
Merge pull request #3 from Orbithealth/dev_sinte
sinteco Aug 14, 2020
2cc9f1b
set name of the patient after redirect to appointment
betsegaw-degefe Aug 19, 2020
b08eef7
revising the patient dashboard and patient summary
betsegaw-degefe Aug 24, 2020
a12af42
IPD trends and configuration chage
betsegaw-degefe Aug 28, 2020
88876d9
expected date of discharge
betsegaw-degefe Sep 5, 2020
34ee548
bed occupancy rate report and emergency report
betsegaw-degefe Sep 5, 2020
7e06a40
liason report
betsegaw-degefe Sep 5, 2020
238b01a
patient summary dashboard order prepared as the given list
betsegaw-degefe Sep 7, 2020
78447f5
print card data issue solved
betsegaw-degefe Sep 7, 2020
d08eb74
branding print
betsegaw-degefe Sep 29, 2020
8108baf
add procedure section in patient summary
betsegaw-degefe Oct 6, 2020
c24768a
generic name for orders module to include procedure
betsegaw-degefe Oct 6, 2020
2344d28
configuring muti-select concepts for forms
betsegaw-degefe Oct 7, 2020
eadc52e
OPD and IPD dashboard order
betsegaw-degefe Nov 5, 2020
5e76170
remove lab and radiology list from dashboard for now
betsegaw-degefe Nov 5, 2020
2474436
add allObservationTemplate to dashboard
betsegaw-degefe Nov 5, 2020
109ea50
hide all and programs tab from clinical dashboard
betsegaw-degefe Nov 6, 2020
d7e28c4
hide opd 1 and patientbylocation tabs in clinical dashboard
betsegaw-degefe Nov 7, 2020
6d5addf
Hide fee information
betsegaw-degefe Nov 17, 2020
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
108 changes: 62 additions & 46 deletions openmrs/apps/adt/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,53 +34,69 @@
"translationKey": "DASHBOARD_TAB_GENERAL_KEY",
"conceptName": "Adt Notes",
"sections": {
"vitals":{
"translationKey":"DASHBOARD_TITLE_VITALS_KEY",
"type": "vitals",
"displayOrder": 0,
"isObservation": true,
"dashboardConfig": {
"conceptNames": ["Vitals"],
"numberOfVisits": 2
"navigationLinksControl":{
"translationKey":"DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY",
"type": "navigationLinksControl",
"displayOrder": 0,
"showLinks" : ["home", "visit", "registration", "inpatient", "enrolment", "visitAttribute", "trends"]
},
"patientInformation":{
"translationKey": "DASHBOARD_TITLE_PATIENT_INFORMATION_KEY",
"type": "patientInformation",
"displayOrder": 1,
"patientAttributes": ["caste", "class", "education", "occupation", "debt", "distanceFromCenter", "isUrban", "cluster","RationCard", "familyIncome"],
"addressFields": ["address1", "address2", "cityVillage", "countyDistrict"]
},
"diagnosis":{
"translationKey":"DASHBOARD_TITLE_DIAGNOSIS_KEY",
"type": "diagnosis",
"numberOfVisits": 1,
"showDetailsButton":true,
"displayOrder": 2
},
"vitals":{
"translationKey":"DASHBOARD_TITLE_VITALS_KEY",
"type": "vitals",
"displayOrder": 3,
"isObservation": true,
"dashboardConfig": {
"conceptNames": ["Vitals"],
"numberOfVisits": 2
}
},
"HistoryAndExamination":{
"type":"historyAndExamination",
"isObservation":true,
"dashboardConfig":{
"showGroupDateTime":false,
"conceptNames":[
"Chief Complaint Data",
"Examination Notes",
"Smoking History",
"Clief COmplaint Notes",
"Blood Pressure"
]
},
"displayOrder":4,
"translationKey":"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY"
},
"conditions": {
"translationKey":"CONDITION_LIST_DISPLAY_CONTROL_TITLE",
"type": "conditionsList",
"displayOrder": 5
},
"admissionDetails":{
"translationKey":"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY",
"type":"admissionDetails",
"displayOrder": 6
},
"disposition":{
"translationKey":"DASHBOARD_TITLE_DISPOSITION_KEY",
"type": "disposition",
"numberOfVisits": 1,
"displayOrder": 7
}
},
"disposition":{
"translationKey":"DASHBOARD_TITLE_DISPOSITION_KEY",
"type": "disposition",
"numberOfVisits": 1,
"displayOrder": 1
},
"diagnosis":{
"translationKey":"DASHBOARD_TITLE_DIAGNOSIS_KEY",
"type": "diagnosis",
"numberOfVisits": 1,
"showDetailsButton":true,
"displayOrder": 2
},
"patientInformation":{
"translationKey": "DASHBOARD_TITLE_PATIENT_INFORMATION_KEY",
"type": "patientInformation",
"displayOrder": 3,
"patientAttributes": ["caste", "class", "education", "occupation", "debt", "distanceFromCenter", "isUrban", "cluster","RationCard", "familyIncome"],
"addressFields": ["address1", "address2", "cityVillage", "countyDistrict"]
},
"admissionDetails":{
"translationKey":"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY",
"type":"admissionDetails",
"displayOrder": 4
},
"navigationLinksControl":{
"translationKey":"DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY",
"type": "navigationLinksControl",
"displayOrder": 5,
"showLinks" : ["home", "visit", "registration", "inpatient", "enrolment", "visitAttribute"]
},
"conditions": {
"translationKey":"CONDITION_LIST_DISPLAY_CONTROL_TITLE",
"type": "conditionsList",
"displayOrder": 6
}
}}

}
}
}
5 changes: 3 additions & 2 deletions openmrs/apps/appointments/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@
"config": {
"minCharLengthToTriggerPatientSearch": 3,
"enableSpecialities": true,
"startOfWeek": "Monday",
"startOfWeek": 2,
"weekStart": "isoWeek",
"calendarSlotDuration": "00:30",
"calendarSlotLabelInterval": "01:00",
"startOfDay":"09:00",
"endOfDay":"19:00",
"printListViewTemplateUrl": "/bahmni_config/openmrs/apps/appointments/printListView.html",
"enableServiceTypes": false,
"enableCalendarView": true,
"defaultViewCalendar": false,
"isServiceOnAppointmentEditable": false,
"enableResetAppointmentStatuses": ["CheckedIn"],
"colorsForAppointmentService": [
"#006400",
"#DC143C",
Expand Down
22 changes: 13 additions & 9 deletions openmrs/apps/appointments/printListView.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<title>Bahmni - Appointment Scheduling</title>
<title>Appointment Scheduling</title>
<style>
h4, p, h5 {
text-align: center;
Expand Down Expand Up @@ -38,13 +38,15 @@ <h5 ng-if="!searchedPatient">{{::'APPOINTMENT_DATE' | translate}} {{::startDate
<th>{{::'APPOINTMENT_PATIENT_ID' |translate}}</th>
<th class="table-mid-width">{{::'APPOINTMENT_PATIENT_NAME' |translate}}</th>
<th ng-if="searchedPatient" class="width-change">{{::'APPOINTMENT_DATE' |translate}}</th>
<th class="width-change">{{::'APPOINTMENT_START_TIME_KEY' |translate}}</th>
<th class="width-change">{{::'APPOINTMENT_END_TIME_KEY' |translate}}</th>
<!-- <th class="width-change">{{::'APPOINTMENT_START_TIME_KEY' |translate}}</th>
<th class="width-change">{{::'APPOINTMENT_END_TIME_KEY' |translate}}</th> -->
<th class="table-mid-width">{{::'APPOINTMENT_PROVIDER' |translate}}</th>
<th>{{::'APPOINTMENT_SERVICE' |translate}}</th>
<th class="table-mid-width" ng-if="enableServiceTypes">{{::'APPOINTMENT_SERVICE_TYPE_FULL' |translate}}</th>
<th class="table-mid-width">{{::'APPOINTMENT_SERVICE_LOCATION_KEY' |translate}}</th>
<!-- <th class="table-mid-width" ng-if="enableServiceTypes">{{::'APPOINTMENT_SERVICE_TYPE_FULL' |translate}}</th>
<th class="table-mid-width">{{::'APPOINTMENT_SERVICE_LOCATION_KEY' |translate}}</th> -->
<th>{{::'APPOINTMENT_STATUS' |translate}}</th>
<th>{{::'APPOINTMENT_CREATOR' |translate}}</th>
<th>{{::'APPOINTMENT_DATE_CREATED' |translate}}</th>
<!--<th class="notes">{{::'APPOINTMENT_COMMENTS' |translate}}</th>-->
</tr>
</thead>
Expand All @@ -53,13 +55,15 @@ <h5 ng-if="!searchedPatient">{{::'APPOINTMENT_DATE' | translate}} {{::startDate
<td>{{::appointment.patient.identifier}}</td>
<td class="table-mid-width">{{::appointment.patient.name | titleCase}}</td>
<td ng-if="searchedPatient">{{::appointment.startDateTime | bahmniDate}}</td>
<td>{{::appointment.startDateTime | bahmniTime}}</td>
<td>{{::appointment.endDateTime | bahmniTime}}</td>
<!-- <td>{{::appointment.startDateTime | bahmniTime}}</td>
<td>{{::appointment.endDateTime | bahmniTime}}</td> -->
<td class="table-mid-width">{{::appointment.provider.name}}</td>
<td>{{::appointment.service.name}}</td>
<td class="table-mid-width" ng-if="enableServiceTypes">{{::appointment.serviceType && (appointment.serviceType.name + ' [' + appointment.serviceType.duration + ' min]')}}</td>
<td class="table-mid-width">{{::appointment.location.name}}</td>
<!-- <td class="table-mid-width" ng-if="enableServiceTypes">{{::appointment.serviceType && (appointment.serviceType.name + ' [' + appointment.serviceType.duration + ' min]')}}</td>
<td class="table-mid-width">{{::appointment.location.name}}</td> -->
<td>{{::appointment.status}}</td>
<td>{{::appointment.creator.name}}</td>
<td>{{::appointment.createDate | bahmniDate}}</td>
<!--<td class="notes">{{::appointment.comments}}</td>-->
</tr>
</tbody>
Expand Down
67 changes: 66 additions & 1 deletion openmrs/apps/clinical/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"hideConditions": false,
"enableRadiologyOrderOptions":["Urgent","NeedsPrint"],
"enableLabOrderOptions":["Urgent", "NeedsPrint"],
"quickPrints":false,
"quickPrints":true,
"networkConnectivity" : {
"showNetworkStatusMessage": false,
"networkStatusCheckInterval": 20000,
Expand Down Expand Up @@ -137,7 +137,72 @@
"Pain management given": true,
"Safe Abortion, Remarks": "Remarks",
"Malaria, Death Date": "2015-12-01"
},
"Safe abortion, Type of uterine evacuation procedure":{
"multiSelect": true
},
"Safe abortion, Contraceptive Method/s provided":{
"multiSelect": true
},
"Safe abortion, if other service provided specify":{
"multiSelect": true
},
"Pattern of food intake": {
"multiSelect": true
},
"Patient has confirmed": {
"multiSelect": true
},
"Method provided":{
"multiSelect": true
},
"Reason for Method Switch":{
"multiSelect": true
},
"Past Medical History":{
"multiSelect": true
},
"Feedback, Patient Name":{
"multiSelect": true
},
"ER, Non Trauma":{
"multiSelect": true
},
"ER, Oby/Gyn":{
"multiSelect": true
},
"Airway and breathing":{
"multiSelect": true
},
"Circulation":{
"multiSelect": true
},
"Dehydration (sever)(only in child with diarrhea) Plus any two of those":{
"multiSelect": true
},
"Ped T":{
"multiSelect": true
},
"Ped P":{
"multiSelect": true
},
"Ped R":{
"multiSelect": true
},
"Underlying disease":{
"multiSelect": true
},
"POS Co Morbidity":{
"multiSelect": true
},
"POS Risk factor":{
"multiSelect": true
},
"Operation Procedure":{
"multiSelect": true
}


},
"visitPage": {
"observationDisplay": {
Expand Down
Loading