=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties 2015-09-18 14:40:16 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties 2015-09-21 08:48:11 +0000 @@ -140,7 +140,7 @@ loading_tree=Loading orgunit tree loading_metadata=Loading meta-data future_date_not_allowed=Future date is not allowed -warning=Warning +warnings=Warnings unsaved_data_exists_proceed=Unsaved data exists. Do you want to proceed? proceed=Proceed lacking_required_authority_to_add_update_event=Lacking required authority to add/update event. === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-09-17 11:21:04 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-09-21 08:48:11 +0000 @@ -1,5 +1,6 @@ - + + Event Capture @@ -62,7 +63,7 @@ - + === 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 2015-09-18 14:40:16 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2015-09-21 08:48:11 +0000 @@ -885,9 +885,10 @@ $scope.infiniteScroll.currentOptions += $scope.infiniteScroll.optionsToAdd; }; - //listen for rule effect changes - $scope.warningMessages = []; + //listen for rule effect changes $scope.$on('ruleeffectsupdated', function(event, args) { + $scope.warningMessages = []; + //console.log('args.event: ', $rootScope.ruleeffects['SINGLE_EVENT'][0]); if($rootScope.ruleeffects[args.event]) { //Establish which event was affected: var affectedEvent = $scope.currentEvent; @@ -899,7 +900,8 @@ } }); } - angular.forEach($rootScope.ruleeffects[args.event], function(effect) { + angular.forEach($rootScope.ruleeffects[args.event], function(effect) { + if( effect.dataElement && effect.ineffect ) { //in the data entry controller we only care about the "hidefield" actions if(effect.action === "HIDEFIELD") { @@ -925,6 +927,9 @@ $log.warn("ProgramRuleAction " + effect.id + " is of type HIDEFIELD, bot does not have a dataelement defined"); } } + if(effect.action === "HIDESECTION") { + //get section id + } if(effect.action === "SHOWERROR" && effect.dataElement.id){ var dialogOptions = { headerText: 'validation_error', @@ -935,12 +940,7 @@ $scope.currentEvent[effect.dataElement.id] = $scope.currentEventOriginialValue[effect.dataElement.id]; } if(effect.action === "SHOWWARNING"){ - $scope.warningMessages[effect.dataElement.id] = effect.content + '
'; - var dialogOptions = { - headerText: 'validation_warning', - bodyText: effect.content - }; - DialogService.showDialog({}, dialogOptions); + $scope.warningMessages.push(effect.content); } } }); @@ -953,9 +953,7 @@ $scope.eventsByStage[$scope.selectedProgramStage.id] = [$scope.currentEvent]; var evs = {all: [$scope.currentEvent], byStage: $scope.eventsByStage}; - var flag = {debug: true, verbose: false}; - - //TrackerRulesExecutionService.executeRules($scope.selectedProgram.id,$scope.currentEvent,$scope.eventsByStage,$scope.prStDes,null,false); + var flag = {debug: true, verbose: false}; TrackerRulesExecutionService.executeRules($scope.allProgramRules, $scope.currentEvent, evs, $scope.prStDes, $scope.selectedTei, $scope.selectedEnrollment, flag); }; === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2015-09-18 14:40:16 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2015-09-21 08:48:11 +0000 @@ -362,4 +362,9 @@ .form-control{ color: black; padding: 5px !important; +} + +.form-control-label { + height: 34px; + font-size: 14px; } \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-09-18 14:40:16 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-09-21 08:48:11 +0000 @@ -249,7 +249,6 @@ -
@@ -507,6 +506,9 @@
+
+ {{warningMessages[de.dataElement.id]}} +
@@ -516,6 +518,6 @@ -
-
-
\ No newline at end of file + + \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html 2015-07-02 07:19:49 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html 2015-09-21 08:48:11 +0000 @@ -58,7 +58,4 @@
-
-
-
-
\ No newline at end of file +
\ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2015-09-17 11:21:04 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2015-09-21 08:48:11 +0000 @@ -98,13 +98,15 @@ {{'event_details'| translate}} {{'new_event'| translate}} -
- -
+
+
+
+
+
-
- -
+
+
+
=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/indicators.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/indicators.html 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/indicators.html 2015-09-21 08:48:11 +0000 @@ -0,0 +1,13 @@ +
+ {{'indicators' | translate}} +
+ + + + + +
+ {{pid.name}} + + +
\ No newline at end of file === added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/warnings.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/warnings.html 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/warnings.html 2015-09-21 08:48:11 +0000 @@ -0,0 +1,10 @@ +
+ {{'warnings' | translate}} +
+ + + + +
+ {{msg}} +
\ No newline at end of file