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

Added EAC Results to patient dashboard #66

Merged
merged 1 commit into from
Oct 8, 2019
Merged

Added EAC Results to patient dashboard #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions openmrs/apps/clinical/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,15 @@
"Reason why Adherence is Fair":{
"required":true
},
"was counselling done?":{
"required":true
},
"Counselling Date":{
"required":true
},
"EAC Results":{
"required":true
},
"defaults": {
"Number of living children": 1,
"Accepted Family Planning methods": [
Expand Down
86 changes: 5 additions & 81 deletions openmrs/apps/clinical/dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,61 +75,6 @@
"showDetailsButton":true
}
},

"radiologyOrders":{
"orderType":"Radiology Order",
"type":"ordersControl",
"translationKey":"DASHBOARD_TITLE_RADIOLOGY_ORDERS_KEY",
"displayOrder":17,
"dashboardConfig":{
"conceptNames":[
"Summary"
],
"numberOfVisits":4
}
},
"labOrdersDisplayControl":{
"translationKey":"DASHBOARD_TITLE_LAB_ORDERS_DISPLAY_CONTROL_KEY",
"type":"ordersControl",
"orderType":"Lab Order",
"showDetailsButton":true,
"displayOrder":9,
"dashboardConfig":{
"conceptNames":[
"Systolic",
"Diastolic",
"Posture",
"Temperature"
]
},
"expandedViewConfig":{
"conceptNames":[
"Systolic",
"Diastolic",
"Posture",
"Temperature"
],
"showDetailsButton":true
}
},
"labResults":{
"translationKey":"DASHBOARD_TITLE_LAB_RESULTS_KEY",
"type":"labOrders",
"displayOrder":6,
"dashboardConfig":{
"title":null,
"numberOfVisits":6,
"showChart":false,
"showTable":true,
"showNormalLabResults": true,
"showCommentsExpanded": true,
"showAccessionNotes": true,
"showDetailsButton":false
},
"expandedViewConfig":{
"numberOfVisits":10
}
},
"nutritionalValues":{
"translationKey":"DASHBOARD_TITLE_NUTRITIONAL_VALUES_KEY",
"type":"vitals",
Expand Down Expand Up @@ -161,20 +106,22 @@
}
},
"vlresults":{
"translationKey":"DASHBOARD_TITLE_VIRAL_LOAD_RESULTS_KEY",
"translationKey":"DASHBOARD_TITLE_VIRAL_LOAD_AND_EAC_RESULTS_KEY",
"type":"vitals",
"isObservation":true,
"displayOrder":2,
"dashboardConfig":{
"conceptNames":[
"VL Results"
"VL Results",
"EAC Results"
],
"showDetailsButton":true,
"numberOfVisits":2
},
"expandedViewConfig":{
"conceptNames":[
"VL Results"
"VL Results",
"EAC Results"
],
"numberOfVisits":24,
"scope":"latest",
Expand Down Expand Up @@ -218,29 +165,6 @@
}
}
},
"secondVitals":{
"translationKey":"DASHBOARD_TITLE_SECOND_VITALS_KEY",
"type":"second vitals",
"isObservation":true,
"displayOrder":13,
"dashboardConfig":{
"showDetailsButton":true,
"conceptNames":[
"Second Vitals"
],
"numberOfVisits":2
},
"expandedViewConfig":{
"conceptNames":[
"Second Vitals"
],
"numberOfVisits":2,
"showDetailsButton":true,
"pivotTable":{

}
}
},
"historyAndExaminations":{
"translationKey":"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY",
"type":"vitals",
Expand Down
25 changes: 0 additions & 25 deletions openmrs/apps/clinical/extension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,31 +355,6 @@
"icon": "fa-user-md",
"order": 7,
"requiredPrivilege": "app:clinical:treatmentTab"
},
"bahmniClinicalConsultationOrders": {
"id": "bahmni.clinical.consultation.orders",
"extensionPointId": "org.bahmni.clinical.consultation.board",
"type": "link",
"label": "Orders",
"translationKey":"ORDERS_BOARD_LABEL_KEY",
"url": "orders",
"icon": "icon-user-md",
"order": 6,
"requiredPrivilege": "app:clinical:ordersTab"
},
"bahmniClinicalConsultationBacteriology": {
"id": "bahmni.clinical.consultation.bacteriology",
"extensionPointId": "org.bahmni.clinical.consultation.board",
"type": "link",
"label": "Bacteriology",
"translationKey":"BACTERIOLOGY_BOARD_LABEL_KEY",
"url": "bacteriology",
"icon": "icon-user-md",
"order": 7,
"requiredPrivilege": "app:clinical:bacteriologyTab"
}



}

22 changes: 16 additions & 6 deletions openmrs/apps/clinical/formConditions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,11 @@ Bahmni.ConceptSet.FormConditions.rules = {
if(vlresults >= 1000){
alert("Patient Required Enhanced Adherence Counselling");
return{
show:["Classification Of Adherence"]
show:["was counselling done?"]
}
}else {
return{
hide:["Classification Of Adherence"]
hide:["was counselling done?"]
}
}
},
Expand Down Expand Up @@ -490,14 +490,12 @@ Bahmni.ConceptSet.FormConditions.rules = {
"ART Follow up - Information": function (formName , formFieldValues, patient){
if(patient.age < 15){
return{
show: ["TB Regimen For Children"],
hide: ["TB Regimen On"]
show: ["TB Regimen For Children"]

}
}else {
return{
hide: ["TB Regimen For Children"],
show: ["TB Regimen On"]
hide: ["TB Regimen For Children"]
}
}
},
Expand Down Expand Up @@ -628,5 +626,17 @@ Bahmni.ConceptSet.FormConditions.rules = {
}
}
},
"was counselling done?": function (formName, formFieldValues) {
var counsellingdone = formFieldValues["was counselling done?"];
if (counsellingdone == true) {
return {
show:["Counselling Date","EAC Results"]
}
} else {
return {
hide:["Counselling Date","EAC Results"]
}
}
},
};

6 changes: 3 additions & 3 deletions openmrs/i18n/clinical/locale_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"DASHBOARD_TITLE_VISITS_KEY": "Visits",
"DASHBOARD_TITLE_PROGRAMS_KEY": "Programs",
"DASHBOARD_TITLE_TREATMENTS_KEY": "Treatments",
"DASHBOARD_TITLE_DISPOSITION_KEY": "Disposition",
"DASHBOARD_TITLE_DISPOSITION_KEY": "Referral",
"DASHBOARD_TITLE_DIAGNOSIS_KEY": "Diagnosis",
"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY": "Admission Details",
"DASHBOARD_TITLE_NUTRITIONAL_VALUES_KEY": "Nutritional Values",
"DASHBOARD_TITLE_VIRAL_LOAD_RESULTS_KEY": "Viral Results",
"DASHBOARD_TITLE_VIRAL_LOAD_AND_EAC_RESULTS_KEY": "Viral load And EAC Results",
"DASHBOARD_TITLE_SECOND_VITALS_KEY": "Second Vitals",
"DASHBOARD_TITLE_GYNAECOLOGY_KEY": "Gynaecology",
"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY": "History and Examinations",
Expand Down Expand Up @@ -58,7 +58,7 @@
"ORDERS_BOARD_LABEL_KEY":"Orders",
"BACTERIOLOGY_BOARD_LABEL_KEY":"Bacteriology",
"CONSULTATION_BOARD_LABEL_KEY":"Consultation",
"DISPOSITION_BOARD_LABEL_KEY":"Disposition",
"DISPOSITION_BOARD_LABEL_KEY":"Referral",
"DIAGNOSIS_BOARD_LABEL_KEY":"Diagnosis",

"CLINICAL_ORDER_RADIOLOGY_NEED_PRINT": "Need Print for this order.",
Expand Down