------------------------------------------------------------
revno: 21786
committer: Markus Bekken <[email protected]>
branch nick: dhis2
timestamp: Wed 2016-01-20 23:27:09 +0100
message:
Fix isHidden in custom forms
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2016-01-19 09:31:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2016-01-20 22:27:09 +0000
@@ -1120,6 +1120,19 @@
return dhis2.validation.isNumber(val) ? val : '';
};
+ //check if field is hidden
+ $scope.isHidden = function(id) {
+ //In case the field contains a value, we cant hide it.
+ //If we hid a field with a value, it would falsely seem the user was aware that the value was entered in the UI.
+ if($scope.currentEvent[id]) {
+ return false;
+ }
+ else {
+ return $scope.hiddenFields[id];
+ }
+ };
+
+
$scope.saveDatavalue = function(){
$scope.executeRules();
};
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
