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

MPOC 396 hideform flag #239

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

MPOC 396 hideform flag #239

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
36 changes: 27 additions & 9 deletions ui/app/common/concept-set/directives/conceptSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ angular.module('bahmni.common.conceptSet')
}
};

var setObservationState = function (obsArray, disable, error, hide) {
var setObservationState = function (obsArray, disable, error, hide, hideForm) {
if (!_.isEmpty(obsArray)) {
_.each(obsArray, function (obs) {
obs.disabled = disable || hide;
obs.disabled = disable || hide || hideForm;
obs.error = error;
obs.hide = hide;
if (hide || obs.disabled) {
Expand All @@ -162,14 +162,14 @@ angular.module('bahmni.common.conceptSet')
if (obs.groupMembers) {
_.each(obs.groupMembers, function (groupMember) {
// TODO : Hack to fix issue with formconditions on multiselect - Swathi
groupMember && setObservationState([groupMember], disable, error, hide);
groupMember && setObservationState([groupMember], disable, error, hide, hideForm);
});
}
});
}
};

var processConditions = function (flattenedObs, fields, disable, error, hide) {
var processConditions = function (flattenedObs, fields, disable, error, hide, hideForm) {
_.each(fields, function (field) {
var matchingObsArray = [];
var clonedObsInSameGroup;
Expand All @@ -183,7 +183,7 @@ angular.module('bahmni.common.conceptSet')
});

if (!_.isEmpty(matchingObsArray)) {
setObservationState(matchingObsArray, disable, error, hide);
setObservationState(matchingObsArray, disable, error, hide, hideForm);
} else {
messagingService.showMessage("error", "No element found with name : " + field);
}
Expand All @@ -202,14 +202,32 @@ angular.module('bahmni.common.conceptSet')
if (!_.isUndefined(conditions)) {
if (conditions.error && !_.isEmpty(conditions.error)) {
messagingService.showMessage('error', conditions.error);
processConditions(flattenedObs, [conceptName], false, true, false);
processConditions(flattenedObs, [conceptName], false, true, false, false);
} else {
enableCase && processConditions(flattenedObs, [conceptName], false, false, false);
enableCase && processConditions(flattenedObs, [conceptName], false, false, false, false);
}
processConditions(flattenedObs, conditions.hideForm, false, undefined, false, true);
processConditions(flattenedObs, conditions.showForm, false, undefined, false, false);
processConditions(flattenedObs, conditions.disable, true);
processConditions(flattenedObs, conditions.enable, false);
processConditions(flattenedObs, conditions.show, false, undefined, false);
processConditions(flattenedObs, conditions.hide, false, undefined, true);
_.each(conditions.showForm, function (subConditionConceptName) {
var conditionFn = Bahmni.ConceptSet.FormConditions.rules && Bahmni.ConceptSet.FormConditions.rules[subConditionConceptName];
if (conditionFn && subConditionConceptName != conditionFn.name) {
runFormConditionForObs(true, formName, conditionFn, subConditionConceptName, flattenedObs);
}
});
_.each(conditions.hideForm, function (subConditionConceptName) {
var conditionFn = Bahmni.ConceptSet.FormConditions.rules && Bahmni.ConceptSet.FormConditions.rules[subConditionConceptName];
if (conditionFn && subConditionConceptName != conditionFn.name) {
_.each(flattenedObs, function (obs) {
if (obs.concept.name == subConditionConceptName) {
runFormConditionForObs(false, formName, conditionFn, subConditionConceptName, flattenedObs);
}
});
}
});
_.each(conditions.enable, function (subConditionConceptName) {
var conditionFn = Bahmni.ConceptSet.FormConditions.rules && Bahmni.ConceptSet.FormConditions.rules[subConditionConceptName];
if (conditionFn != null) {
Expand All @@ -228,13 +246,13 @@ angular.module('bahmni.common.conceptSet')
});
_.each(conditions.show, function (subConditionConceptName) {
var conditionFn = Bahmni.ConceptSet.FormConditions.rules && Bahmni.ConceptSet.FormConditions.rules[subConditionConceptName];
if (conditionFn && subConditionConceptName != conditionFn.name) {
if (conditionFn) {
runFormConditionForObs(true, formName, conditionFn, subConditionConceptName, flattenedObs);
}
});
_.each(conditions.hide, function (subConditionConceptName) {
var conditionFn = Bahmni.ConceptSet.FormConditions.rules && Bahmni.ConceptSet.FormConditions.rules[subConditionConceptName];
if (conditionFn && subConditionConceptName != conditionFn.name) {
if (conditionFn) {
_.each(flattenedObs, function (obs) {
if (obs.concept.name == subConditionConceptName) {
runFormConditionForObs(false, formName, conditionFn, subConditionConceptName, flattenedObs);
Expand Down