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.

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

Validations 1.3 #32

Open
wants to merge 53 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
61f2152
BAH-621 | updated IPD ward list view search handler - wardListSqlSear…
angshu Aug 30, 2018
e6bb1ec
Bindu | BAH-621 | Removed patientWardDetails.sql as this migration al…
binduak Aug 31, 2018
5c7938f
removing unused extensions, correcting typo and invalid URL for link
angshu Aug 31, 2018
99e5006
registration app config file
shilpa-iplit Jun 24, 2019
2b09262
Merge pull request #5 from IntelliSOFT-Consulting/registration
Ekirapapaul Jun 24, 2019
9b02e89
Change header text
Ekirapapaul Jun 24, 2019
464f3af
Merge branch 'ihssudan' of https://github.com/IntelliSOFT-Consulting/…
Ekirapapaul Jun 24, 2019
c642769
registration search changes
shilpa-iplit Jun 25, 2019
7db085c
Merge pull request #6 from IntelliSOFT-Consulting/registrationSearch
Ekirapapaul Jun 25, 2019
b5e0c00
For add, edit appointments
shilpa-iplit Jun 28, 2019
43e819e
Merge pull request #7 from IntelliSOFT-Consulting/appointments
Ekirapapaul Jun 30, 2019
739d994
A provision to add more than one row in general family information
daviemukungi Jul 8, 2019
1d39096
Merge pull request #8 from IntelliSOFT-Consulting/davie
Ekirapapaul Jul 10, 2019
a25ab6e
newRegistration files
shilpa-iplit Jul 10, 2019
51468a6
Merge pull request #9 from IntelliSOFT-Consulting/newRegistration
Ekirapapaul Jul 10, 2019
0abdd35
reports additional tabs for customize reports
shilpa-iplit Jul 12, 2019
ea2c043
Missed appointment report sql
shilpa-iplit Jul 15, 2019
0485aeb
End Of follow up form validation
daviemukungi Jul 15, 2019
d8823a5
Merge pull request #10 from IntelliSOFT-Consulting/appointmentReports
Ekirapapaul Jul 16, 2019
c6ab7cb
Removed unneccesary comments
daviemukungi Jul 16, 2019
6046b69
Fixed Indentation
daviemukungi Jul 16, 2019
7c16c93
Merge pull request #11 from IntelliSOFT-Consulting/davie
Ekirapapaul Jul 16, 2019
3e8fe51
Corrected missed appointments query
shilpa-iplit Jul 17, 2019
ba8f6c4
Treatment Supporter concepts added on visit form
shilpa-iplit Jul 17, 2019
73b3bd1
Merge pull request #12 from IntelliSOFT-Consulting/appointmentReports
Ekirapapaul Jul 19, 2019
530fc19
Merge pull request #13 from IntelliSOFT-Consulting/newRegistration
Ekirapapaul Jul 19, 2019
7798dbd
Customized the patient Registration card
daviemukungi Jul 22, 2019
8c923d7
Marital status and cohort date added to search
shilpa-iplit Jul 23, 2019
09cb637
Merge pull request #14 from IntelliSOFT-Consulting/davie
Ekirapapaul Jul 23, 2019
57f33a2
Merge pull request #15 from IntelliSOFT-Consulting/newSearch
Ekirapapaul Jul 23, 2019
060425c
Remove fee inforamtion from online anf offline apps
Ekirapapaul Jul 23, 2019
4a5f702
Merge pull request #16 from IntelliSOFT-Consulting/regChnges
Ekirapapaul Jul 23, 2019
58f794a
Updated Form validations and Logic
daviemukungi Jul 23, 2019
856a338
Merge pull request #17 from IntelliSOFT-Consulting/davie
Ekirapapaul Jul 23, 2019
721db16
Remove default reports
Ekirapapaul Jul 23, 2019
0acb244
Merge pull request #18 from IntelliSOFT-Consulting/regChnges
Ekirapapaul Jul 23, 2019
96db244
Clean up the dashboard (#19)
Ekirapapaul Jul 23, 2019
a079ee8
TB Screening form validation (#20)
daviemukungi Jul 30, 2019
ea7d10d
registration feedback modifications (#21)
shilpa-iplit Jul 30, 2019
c214ab8
Visit Appointment Report (#22)
shilpa-iplit Jul 30, 2019
0462d64
removing treatment supporter fields from visit form (#23)
shilpa-iplit Jul 30, 2019
8b5b8f7
ART treatment ART Initial Regimen Validations (#24)
daviemukungi Jul 31, 2019
436a34c
Dav dhis2 (#25)
daviemukungi Aug 6, 2019
4b178a1
Pin all observation forms (#26)
Ekirapapaul Aug 6, 2019
c61ef5a
Dav dhis2 (#27)
daviemukungi Aug 14, 2019
1415c7d
Changed the Lost follow up days to 28 (#29)
daviemukungi Aug 15, 2019
1d116d6
Validation 2.1 (#30)
daviemukungi Aug 19, 2019
190b73d
Validation 2.1 (#31)
daviemukungi Aug 21, 2019
0c2560a
Art register monthly report (#32)
shilpa-iplit Aug 22, 2019
3a56c55
Validation 2.1 (#33)
daviemukungi Aug 22, 2019
8a3e8d4
Validation 2.1 (#34)
daviemukungi Aug 23, 2019
3b77ee8
Validation 2.1 (#36)
daviemukungi Aug 27, 2019
8f39e78
Validations for TB Regimens
daviemukungi Sep 3, 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
Prev Previous commit
Next Next commit
Updated Form validations and Logic
  • Loading branch information
daviemukungi committed Jul 23, 2019
commit 58f794a14075781b32d0a69b2b0af4c932433f33
57 changes: 57 additions & 0 deletions openmrs/apps/clinical/app.json
Original file line number Diff line number Diff line change
@@ -137,6 +137,63 @@
"Accepted Family Planning methods": {
"multiSelect": true
},
"Other Entry Point":{
"required":true
},
"Other - Occupation":{
"required":true
},
"HIV - Entry Point":{
"required":true
},
"Name of Clinic":{
"required":true
},
"Date Transferred in":{
"required":true
},
"Literate":{
"required":true
},
"Education Level":{
"required":true
},
"HIV Care - Alcohol Intake":{
"required":true
},
"Drug Allergies":{
"required":true
},
"HIV Care -Drug Allergies Notes":{
"required":true
},
"ARVs Received in":{
"required":true
},
"Place Received ART":{
"required":true
},
"Other (Place specify)":{
"required":true
},
"Were ARVS Received , In Clinical Milestones":{
"required":true
},
"ART Follow up - Scheduled Date":{
"required":true
},
"FP Method":{
"required":true
},
"Number of Days Hospitalized":{
"required":true
},
"Child Regimen Information":{
"allowAddMore": true
},
"ART Regimen(Switch to 2nd Line)":{
"allowAddMore": true
},
"defaults": {
"Number of living children": 1,
"Accepted Family Planning methods": [
140 changes: 139 additions & 1 deletion openmrs/apps/clinical/formConditions.js
Original file line number Diff line number Diff line change
@@ -63,5 +63,143 @@ Bahmni.ConceptSet.FormConditions.rules = {
}
}

}
},
"HIV - Entry Point" : function (formName , formFieldValues){
var entrypoint = formFieldValues["HIV - Entry Point"];

if(entrypoint === "Other Entry Point (Specify)"){
return{
show: ["Other Entry Point"]
}
}else {
return{
hide: ["Other Entry Point"]
}
}
},
"Transferred in on ART?" : function (formName , formFieldValues){
var transferred = formFieldValues["Transferred in on ART?"];

if(transferred == true){
return{
show: ["Name of Clinic" , "Date Transferred in"]
}
}else {
return{
hide: ["Name of Clinic" , "Date Transferred in"]
}
}
},
"Literate" : function (formName , formFieldValues){
var literate = formFieldValues["Literate"];
if(literate == true){
return{
show: ["Education Level"]
}
}else {
return{
hide: ["Education Level"]
}
}
},
"Drug Allergies" : function (formName , formFieldValues){
var allergy = formFieldValues["Drug Allergies"];
if(allergy == true){
return{
show: ["HIV Care -Drug Allergies Notes"]
}
}else {
return{
hide: ["HIV Care -Drug Allergies Notes"]
}
}
},
"Were ARVS Received , In Clinical Milestones" : function (formName , formFieldValues){
var arvsreceived = formFieldValues["Were ARVS Received , In Clinical Milestones"];
if(arvsreceived == true){
return{
show: ["ARVs Received in" , "Place Received ART", "Other (Place specify)"]
}
}else {
return{
hide: ["ARVs Received in", "Place Received ART" , "Other (Place specify)"]
}
}
},
"Planned Delivery Place" : function (formName , formFieldValues){
var otheranswer = formFieldValues["Planned Delivery Place"];
if(otheranswer === "Other Answer"){
return{
show: ["Other (Place specify)"]
}
}else {
return{
hide: ["Other (Place specify)"]
}
}
},
"TB Screening, Person Age" : function (formName , formFieldValues){
var personage = formFieldValues["TB Screening, Person Age"];
if(personage < 15){
return{
show: ["Close Contact History with TB patients"]
}
}else {
return{
hide: ["Close Contact History with TB patients"]
}
}
},
"Follow up - Scheduled" : function (formName , formFieldValues){
var scheduled = formFieldValues["Follow up - Scheduled"];
if(scheduled == true){
return{
show: ["ART Follow up - Scheduled Date"]
}
}else {
return{
hide: ["ART Follow up - Scheduled Date"]
}
}
},
"Current on FP" : function (formName , formFieldValues){
var currentfp = formFieldValues["Current on FP"];
if(currentfp == true){
return{
show: ["FP Method"]
}
}else {
return{
hide: ["FP Method"]
}
}
},
"Hospitalised" : function (formName , formFieldValues){
var hospitalised = formFieldValues["Hospitalised"];
if(hospitalised == true){
return{
show: ["Number of Days Hospitalized"]
}
}else {
return{
hide: ["Number of Days Hospitalized"]
}
}
},

"AntiRetroviral Treatment" : function (formName , formFieldValues, patient){
if(patient.age < 15){
return{
show: ["Child Regimen Information"],
hide:["ART Regimen - Substitution within 1st Line" , "ART Regimen(Switch to 2nd Line)"]
}
}else {
return{
hide: ["Child Regimen Information"]
}
}
},



};