=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/index.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/index.html 2015-01-28 19:03:29 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/index.html 2015-02-02 13:42:37 +0000 @@ -49,8 +49,8 @@ - - + + === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2015-01-23 14:07:46 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2015-02-02 13:42:37 +0000 @@ -56,16 +56,14 @@ ../dhis-web-commons/javascripts/angular/angular-animate.js ../dhis-web-commons/javascripts/angular/ui-bootstrap-tpls-0.10.0-draggable-modal.js - -#scripts/angular-translate.min.js ../dhis-web-commons/javascripts/angular/plugins/angularLocalStorage.js ../dhis-web-commons/javascripts/angular/plugins/angular-translate.min.js ../dhis-web-commons/javascripts/angular/plugins/angular-translate-loader-static-files.min.js ../dhis-web-commons/javascripts/angular/plugins/angular-translate-loader-url.min.js -../dhis-web-commons/javascripts/angular/plugins/dhis2/directives.js -../dhis-web-commons/javascripts/angular/plugins/dhis2/filters.js -../dhis-web-commons/javascripts/angular/plugins/dhis2/services.js -../dhis-web-commons/javascripts/angular/plugins/dhis2/controllers.js +../dhis-web-commons/javascripts/dhis2/angular.directives.js +../dhis-web-commons/javascripts/dhis2/angular.filters.js +../dhis-web-commons/javascripts/dhis2/angular.services.js +../dhis-web-commons/javascripts/dhis2/angular.controllers.js ../dhis-web-commons/javascripts/moment/moment-with-langs.min.js === 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-01-29 17:13:36 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-02-02 13:42:37 +0000 @@ -66,10 +66,10 @@ - - - - + + + + === 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-01-29 17:13:36 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2015-02-02 13:42:37 +0000 @@ -196,11 +196,7 @@ ErrorMessageService.setErrorMessages(errorMessages); ProgramValidationService.getByProgram($scope.selectedProgram.id).then(function(pvs){ - $scope.programValidations = pvs; - - console.log('the validations: ', $scope.programValidations); - $scope.loadEvents(); }); }); === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js 2015-01-14 11:21:15 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js 2015-02-02 13:42:37 +0000 @@ -2,7 +2,8 @@ function($rootScope, $scope, CurrentSelection, - DateUtils, + CustomFormService, + TEFormService, TEIService, DialogService, AttributesFactory) { @@ -31,6 +32,24 @@ //if no program, display attributesInNoProgram TEIService.processAttributes($scope.selectedTei, $scope.selectedProgram, $scope.selectedEnrollment).then(function(tei){ $scope.selectedTei = tei; + if($scope.selectedProgram && $scope.selectedProgram.id){ + AttributesFactory.getByProgram($scope.selectedProgram).then(function(atts){ + $scope.attributesById = []; + angular.forEach(atts, function(att){ + $scope.attributesById[att.id] = att; + }); + + $scope.selectedProgram.hasCustomForm = false; + TEFormService.getByProgram($scope.selectedProgram, atts).then(function(teForm){ + if(angular.isObject(teForm)){ + $scope.selectedProgram.hasCustomForm = true; + $scope.selectedProgram.displayCustomForm = $scope.selectedProgram.hasCustomForm ? true:false; + $scope.trackedEntityForm = teForm; + $scope.customForm = CustomFormService.getForTrackedEntity($scope.trackedEntityForm, 'PROFILE'); + } + }); + }); + } }); }); === added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/custom-form.html' === added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-form.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-form.html 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-form.html 2015-02-02 13:42:37 +0000 @@ -0,0 +1,138 @@ +
+ {{'entity_type'| translate}} + | ++ + | +
+ {{attribute.name}} + | +
+
+
+
+
+ {{'required'| translate}}
+
+
+
+ {{'required'| translate}}
+
+
+
+ {{'required'| translate}}
+
+
+
+
+
+
+
+
+ {{'required'| translate}}
+
+
+
+
+
+ + + + +
+
+ {{'required'| translate}}
+
+
+
+ {{'required'| translate}}
+
+
+
+ {{'required'| translate}}
+
+ |
+
+ {{selectedProgram.dateOfEnrollmentDescription}} + | ++ + {{'required'| translate}} + | +
+ {{selectedProgram.dateOfIncidentDescription}} + | ++ + | +