dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36150
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18511: tracker-capture: more refactoring
------------------------------------------------------------
revno: 18511
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-03-06 16:15:45 +0100
message:
tracker-capture: more refactoring
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js
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/services.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-tracker-capture/components/report/overdue-events-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js 2015-03-06 14:54:40 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js 2015-03-06 15:15:45 +0000
@@ -64,32 +64,11 @@
$scope.loadPrograms = function(orgUnit) {
$scope.selectedOrgUnit = orgUnit;
if (angular.isObject($scope.selectedOrgUnit)){
- ProgramFactory.getAll().then(function(programs){
- $scope.programs = [];
- angular.forEach(programs, function(program){
- if(program.organisationUnits.hasOwnProperty($scope.selectedOrgUnit.id)){
- $scope.programs.push(program);
- }
- });
- if($scope.programs.length === 0){
- $scope.selectedProgram = null;
- }
- else{
- if($scope.selectedProgram){
- angular.forEach($scope.programs, function(program){
- if(program.id === $scope.selectedProgram.id){
- $scope.selectedProgram = program;
- }
- });
- }
- else{
- if($scope.programs.length === 1){
- $scope.selectedProgram = $scope.programs[0];
- }
- }
- }
+ ProgramFactory.getProgramsByOu($scope.selectedOrgUnit, $scope.selectedProgram).then(function(response){
+ $scope.programs = response.programs;
+ $scope.selectedProgram = response.selectedProgram;
});
- }
+ }
};
//watch for selection of program
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics-controller.js 2015-03-06 14:43:54 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics-controller.js 2015-03-06 15:15:45 +0000
@@ -30,30 +30,9 @@
$scope.loadPrograms = function(orgUnit) {
$scope.selectedOrgUnit = orgUnit;
if (angular.isObject($scope.selectedOrgUnit)){
- ProgramFactory.getAll().then(function(programs){
- $scope.programs = [];
- angular.forEach(programs, function(program){
- if(program.organisationUnits.hasOwnProperty($scope.selectedOrgUnit.id)){
- $scope.programs.push(program);
- }
- });
- if($scope.programs.length === 0){
- $scope.selectedProgram = null;
- }
- else{
- if($scope.selectedProgram){
- angular.forEach($scope.programs, function(program){
- if(program.id === $scope.selectedProgram.id){
- $scope.selectedProgram = program;
- }
- });
- }
- else{
- if($scope.programs.length === 1){
- $scope.selectedProgram = $scope.programs[0];
- }
- }
- }
+ ProgramFactory.getProgramsByOu($scope.selectedOrgUnit, $scope.selectedProgram).then(function(response){
+ $scope.programs = response.programs;
+ $scope.selectedProgram = response.selectedProgram;
});
}
};
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js 2015-03-06 14:43:54 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js 2015-03-06 15:15:45 +0000
@@ -42,30 +42,9 @@
$scope.loadPrograms = function(orgUnit) {
$scope.selectedOrgUnit = orgUnit;
if (angular.isObject($scope.selectedOrgUnit)){
- ProgramFactory.getAll().then(function(programs){
- $scope.programs = [];
- angular.forEach(programs, function(program){
- if(program.organisationUnits.hasOwnProperty($scope.selectedOrgUnit.id)){
- $scope.programs.push(program);
- }
- });
- if($scope.programs.length === 0){
- $scope.selectedProgram = null;
- }
- else{
- if($scope.selectedProgram){
- angular.forEach($scope.programs, function(program){
- if(program.id === $scope.selectedProgram.id){
- $scope.selectedProgram = program;
- }
- });
- }
- else{
- if($scope.programs.length === 1){
- $scope.selectedProgram = $scope.programs[0];
- }
- }
- }
+ ProgramFactory.getProgramsByOu($scope.selectedOrgUnit, $scope.selectedProgram).then(function(response){
+ $scope.programs = response.programs;
+ $scope.selectedProgram = response.selectedProgram;
});
}
};
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js 2015-03-06 14:54:40 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js 2015-03-06 15:15:45 +0000
@@ -46,30 +46,9 @@
$scope.loadPrograms = function(orgUnit) {
$scope.selectedOrgUnit = orgUnit;
if (angular.isObject($scope.selectedOrgUnit)){
- ProgramFactory.getAll().then(function(programs){
- $scope.programs = [];
- angular.forEach(programs, function(program){
- if(program.organisationUnits.hasOwnProperty($scope.selectedOrgUnit.id)){
- $scope.programs.push(program);
- }
- });
- if($scope.programs.length === 0){
- $scope.selectedProgram = null;
- }
- else{
- if($scope.selectedProgram){
- angular.forEach($scope.programs, function(program){
- if(program.id === $scope.selectedProgram.id){
- $scope.selectedProgram = program;
- }
- });
- }
- else{
- if($scope.programs.length === 1){
- $scope.selectedProgram = $scope.programs[0];
- }
- }
- }
+ ProgramFactory.getProgramsByOu($scope.selectedOrgUnit, $scope.selectedProgram).then(function(response){
+ $scope.programs = response.programs;
+ $scope.selectedProgram = response.selectedProgram;
});
}
};
=== 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 2015-03-06 10:08:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2015-03-06 15:15:45 +0000
@@ -100,34 +100,12 @@
$scope.selectedOrgUnit = orgUnit;
if (angular.isObject($scope.selectedOrgUnit)) {
-
- ProgramFactory.getAll().then(function(programs){
- $scope.programs = [];
- angular.forEach(programs, function(program){
- if(program.organisationUnits.hasOwnProperty($scope.selectedOrgUnit.id)){
- $scope.programs.push(program);
- }
- });
-
- if($scope.programs.length === 0){
- $scope.selectedProgram = null;
- }
- else{
- if($scope.selectedProgram){
- angular.forEach($scope.programs, function(program){
- if(program.id === $scope.selectedProgram.id){
- $scope.selectedProgram = program;
- }
- });
- }
- else{
- if($scope.programs.length === 1){
- $scope.selectedProgram = $scope.programs[0];
- }
- }
- }
- $scope.processAttributes();
+
+ ProgramFactory.getProgramsByOu($scope.selectedOrgUnit, $scope.selectedProgram).then(function(response){
+ $scope.programs = response.programs;
+ $scope.selectedProgram = response.selectedProgram;
+ $scope.processAttributes();
$scope.search($scope.searchMode.listAll);
});
}
=== 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 2015-03-06 14:43:54 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-03-06 15:15:45 +0000
@@ -169,7 +169,44 @@
});
});
return def.promise;
- }
+ },
+ getProgramsByOu: function(ou, selectedProgram){
+ var def = $q.defer();
+
+ TCStorageService.currentStore.open().done(function(){
+ TCStorageService.currentStore.getAll('programs').done(function(prs){
+ var programs = [];
+ angular.forEach(prs, function(pr){
+ if(pr.organisationUnits.hasOwnProperty(ou.id)){
+ programs.push(pr);
+ }
+ });
+ if(programs.length === 0){
+ selectedProgram = null;
+ }
+ else{
+ if(selectedProgram){
+ angular.forEach(programs, function(pr){
+ if(pr.id === selectedProgram.id){
+ selectedProgram = pr;
+ }
+ });
+ }
+ else{
+ if(programs.length === 1){
+ selectedProgram = programs[0];
+ }
+ }
+ }
+
+ $rootScope.$apply(function(){
+ def.resolve({programs: programs, selectedProgram: selectedProgram});
+ });
+ });
+ });
+
+ return def.promise;
+ }
};
})
