=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-05-06 12:52:00 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-05-12 14:08:02 +0000 @@ -50,6 +50,7 @@ "use_all_children": "Use all children", "data_element": "Data element", "value": "Value", + "provided_elsewhere": "Provided elsewhere", "show_hide_widgets": "Show/Hide widgets", "select_widgets_to_show": "Select widgets to show", "close": "Close", === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-05-08 09:34:02 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-05-12 14:08:02 +0000 @@ -31,7 +31,8 @@ //Searching $scope.showSearchDiv = false; - $scope.searchField = {title: 'search', isOpen: false}; + $scope.searchField = {title: 'search', isOpen: false}; + $scope.attributes = []; //watch for selection of org unit from tree $scope.$watch('selectedOrgUnit', function() { @@ -39,13 +40,48 @@ if( angular.isObject($scope.selectedOrgUnit)){ $scope.trackedEntityList = []; + $scope.selectedProgram = ''; //apply translation - by now user's profile is fetched from server. TranslationService.translate(); + $scope.loadPrograms($scope.selectedOrgUnit); $scope.attributes = storage.get('ATTRIBUTES'); } }); + //load programs associated with the selected org unit. + $scope.loadPrograms = function(orgUnit) { + + $scope.selectedOrgUnit = orgUnit; + $scope.selectedProgram = null; + $scope.selectedProgramStage = null; + + if (angular.isObject($scope.selectedOrgUnit)) { + + $scope.programs = []; + + var programs = storage.get('TRACKER_PROGRAMS'); + + if( programs && programs != 'undefined' ){ + for(var i=0; ithead>tr, === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html 2014-04-04 11:55:55 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html 2014-05-12 14:08:02 +0000 @@ -29,6 +29,20 @@
+ + + + + + + + + -
+ {{'data_element' | translate}} + + {{'value' | translate}} + + {{'provided_elsewhere' | translate}} +
{{prStDe.dataElement.name}} @@ -73,8 +87,16 @@ + + + +
+ + +
+
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/enrollment.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/enrollment.html 2014-04-04 11:55:55 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/enrollment.html 2014-05-12 14:08:02 +0000 @@ -55,6 +55,7 @@ {{programStage.minDaysFromStart}} + {{selectedEnrollment.dateOfIncident}} === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-04-08 15:37:00 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-05-12 14:08:02 +0000 @@ -22,6 +22,16 @@
+ {{'program'| translate}} +
+
+ +
+
+
+
{{'available_search_attributes'| translate}} | @@ -31,6 +41,7 @@
+
{{'selected_search_attributes'| translate}} @@ -139,6 +150,26 @@
+ + + + + + + + + - - - - - +
{{'org_unit_mode'| translate}} + {{'use_selected'| translate}}
+ {{'use_immediate_children'| translate}}
+ {{'use_all_children'| translate}} +
+ {{'program'| translate}} + {{attributes.size}} + + +
{{attribute.name}} @@ -174,15 +205,7 @@
{{'org_unit_mode'| translate}} - {{'use_selected'| translate}}
- {{'use_immediate_children'| translate}}
- {{'use_all_children'| translate}} -