=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2016-01-15 13:45:46 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2016-02-11 13:25:22 +0000 @@ -27,7 +27,7 @@ TEIGridService, TEIService, EventReportService, - ModalService,$q) { + $q) { $scope.maxOptionSize = 30; $scope.eventsTodayFilters = [{name: $translate.instant('events_today_all'), value: 'all'},{name: $translate.instant('events_today_completeoractive'),value: 'completedOrActive', status:['COMPLETED', 'ACTIVE']},{name: $translate.instant('events_today_skipped') , value: 'skipped', status:['SKIPPED']},{name: $translate.instant('events_today_scheduled'), value: 'scheduled', status:['SCHEDULE']}]; $scope.selectedEventsTodayFilter = $scope.eventsTodayFilters[0]; === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2016-02-04 10:43:43 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2016-02-11 13:25:22 +0000 @@ -243,7 +243,7 @@ }) /* Factory to fetch programs */ -.factory('ProgramFactory', function($q, $rootScope, SessionStorageService, TCStorageService) { +.factory('ProgramFactory', function($q, $rootScope, SessionStorageService, TCStorageService, orderByFilter) { var userHasValidRole = function(program, userRoles){ @@ -304,6 +304,8 @@ } }); + programs = orderByFilter(programs, '-name').reverse(); + if(programs.length === 0){ selectedProgram = null; } @@ -324,6 +326,10 @@ } } } + + if(!selectedProgram && programs.legth > 0){ + selectedProgram = programs[0]; + } $rootScope.$apply(function(){ def.resolve({programs: programs, selectedProgram: selectedProgram}); @@ -360,6 +366,8 @@ } }); + programs = orderByFilter(programs, '-name').reverse(); + if(programs.length === 0){ selectedProgram = null; } @@ -380,6 +388,10 @@ } } } + + if(!selectedProgram || angular.isUndefined(selectedProgram) && programs.legth > 0){ + selectedProgram = programs[0]; + } $rootScope.$apply(function(){ def.resolve({programs: programs, selectedProgram: selectedProgram}); === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2016-01-14 13:41:40 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2016-02-11 13:25:22 +0000 @@ -68,7 +68,7 @@ on-select="getProgramAttributes(model.selectedProgram)" style="width:100%;"> {{$select.selected.name || $select.selected}} - +