dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21762
committer: Markus Bekken <markus.bekken@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2016-01-15 16:27:38 +0100
message:
  Fixed location select in EC
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.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-event-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js	2016-01-09 11:32:08 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js	2016-01-15 15:27:38 +0000
@@ -60,27 +60,6 @@
     };
 })
 
-/* current selections */
-.service('CurrentSelection', function(){
-
-    this.ouLevels = null;     
-    this.location = null;
-    
-    this.setOuLevels = function(ouLevels){
-        this.ouLevels = ouLevels;
-    };
-    this.getOuLevels = function(){
-        return this.ouLevels;
-    };
-    
-    this.setLocation = function(location){
-        this.location = location;
-    };
-    this.getLocation = function(){
-        return this.location;
-    };
-})
-
 /* Factory to fetch optionSets */
 .factory('OptionSetService', function() { 
     return {

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js	2016-01-13 16:59:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js	2016-01-15 15:27:38 +0000
@@ -2006,6 +2006,7 @@
         this.relationshipOwner = {};
         this.selectedTeiEvents = [];
         this.fileNames = [];
+            this.location = null;
 
         this.set = function(currentSelection){
             this.currentSelection = currentSelection;
@@ -2069,6 +2070,13 @@
         this.getFileNames = function(){
             return this.fileNames;
         };
+        
+        this.setLocation = function(location){
+            this.location = location;
+        };
+        this.getLocation = function(){
+            return this.location;
+        };
     })
     .service('AuditHistoryDataService', function( $http, DialogService ) {
         this.getAuditHistoryData = function( dataElementID, dataType, dataElementName, currentEvent, selectedTeiId ) {