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

Validation 2.1 #34

Merged
merged 8 commits into from
Aug 23, 2019
Merged

Validation 2.1 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac1bb9a
Changed the Lost follow up days to 28
daviemukungi Aug 15, 2019
49fe997
Added various program's attributes
daviemukungi Aug 16, 2019
c2e21d7
Pinned HEI forms to Left panel
daviemukungi Aug 21, 2019
c010bcd
Merge branch 'ihssudan' into validation_2.1
daviemukungi Aug 21, 2019
1cb92f8
HEI Forms validations
daviemukungi Aug 21, 2019
05dfdc4
ART History and Clinical Milestones Validations
daviemukungi Aug 22, 2019
798c644
ART TReatment and Interruption Form
daviemukungi Aug 23, 2019
a6fd0a7
Merge branch 'ihssudan' into validation_2.1
daviemukungi Aug 23, 2019
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
11 changes: 11 additions & 0 deletions openmrs/apps/clinical/extension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,17 @@
"order": 13,
"requiredPrivilege": "app:clinical"
},
"bahmniClinicalConceptSetGroupObsertionsARTTreatment": {
"id": "bahmni.clinical.conceptSetGroup.observations.vitals",
"extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations",
"type": "config",
"extensionParams": {
"default": true,
"conceptName": "ART Treatment And Interruptions Form"
},
"order": 14,
"requiredPrivilege": "app:clinical"
},
"bahmniClinicalConceptSetGroupObservationsSecondVitals": {
"id": "bahmni.clinical.conceptSetGroup.observations.secondVitals",
"extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations",
Expand Down
18 changes: 16 additions & 2 deletions openmrs/apps/clinical/formConditions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,22 @@ Bahmni.ConceptSet.FormConditions.rules = {
show:["Substitution Regimen (2nd Line Adults)"]
}
}
},

},
"AntiRetroviral Treatment" : function (formName , formFieldValues, patient){
if(patient.age < 15){
return{
show: ["Initial ART Regimen For Children"],
hide:["Initial ART Regimen (Adult)"]

}
}else {
return{
hide: ["Initial ART Regimen For Children"],
show:["Initial ART Regimen (Adult)"]

}
}
},
"Is there an immunization not Given?" : function (formName , formFieldValues){
var immunizationgiven = formFieldValues["Is there an immunization not Given?"];
if(immunizationgiven == true){
Expand Down