=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-09-22 16:33:27 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-09-23 09:40:16 +0000 @@ -39,6 +39,7 @@ $scope.hiddenFields = {}; $scope.errorMessages = {}; $scope.warningMessages = {}; + $scope.hiddenSections = {}; $scope.tableMaxNumberOfDataElements = 10; //Labels @@ -135,7 +136,19 @@ else { $log.warn("ProgramRuleAction " + effect.id + " is of type HIDEFIELD, bot does not have a dataelement defined"); } + } else if (effect.action === "HIDESECTION"){ + if(effect.programStageSection){ + if(effect.ineffect){ + $scope.hiddenSections[effect.programStageSection] = true; + } else{ + $scope.hiddenSections[effect.programStageSection] = false; + } + } + else { + $log.warn("ProgramRuleAction " + effect.id + " is of type HIDESECTION, bot does not have a section defined"); + } } + } }); }; @@ -1172,8 +1185,6 @@ DialogService.showDialog({}, dialogOptions); } }); - - }; //If the caller wants to create right away, go ahead and save. === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2015-09-22 16:33:27 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2015-09-23 09:40:16 +0000 @@ -218,7 +218,7 @@
- +