dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20822
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-10-21 12:04:51 +0200
message:
  tracker-capture: keept ouTree out of D2LeftBar directive
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js
  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/left-bar.html
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.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/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-10-21 08:56:32 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-10-21 10:04:51 +0000
@@ -361,9 +361,9 @@
         }, function(){            
         });
     };
+    
     $scope.back = function(){
         $location.path('/').search({program: $scope.selectedProgramId});
-        $route.reload();
     };
     
     $scope.displayEnrollment = false;

=== 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	2015-10-21 08:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-10-21 10:04:51 +0000
@@ -27,7 +27,26 @@
     });
 </script>
 
-<d2-left-bar></d2-left-bar>
+<span id="showLeftBar">
+    <a href="javascript:dhis2.leftBar.showAnimated()" title="$i18n.getString('show_menu' )"><i class="fa fa-arrow-right leftBarIcon"></i></a>
+</span>
+
+<div id="leftBar">
+    
+    <d2-left-bar></d2-left-bar>
+    
+    <div id="orgUnitTree">
+        <ul>
+        </ul>
+    </div>
+    
+    <img id="ouwt_loader" src="../images/ajax-loader-bar.gif" alt="{{'in_progress'| translate}}"/>
+    
+    <div class="small-horizonal-spacing" ng-if="!treeLoaded">
+        {{'loading_tree'| translate}}
+    </div>
+    
+</div>
 
 <div class="page" id="mainPage">
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/left-bar.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/left-bar.html	2015-10-12 14:21:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/left-bar.html	2015-10-21 10:04:51 +0000
@@ -1,31 +1,18 @@
-<span id="showLeftBar">
-    <a href="javascript:dhis2.leftBar.showAnimated()" title="$i18n.getString('show_menu' )"><i class="fa fa-arrow-right leftBarIcon"></i></a>
-</span>
-<div id="leftBar">
-    <div id="hideLeftBar">
-        <a href="index.action" title="{{'show_main_menu'| translate}}" id="showMainMenuLink"><i class="fa fa-home leftBarIcon"></i></a>
-        <a href="javascript:dhis2.leftBar.hideAnimated()" title="{{'hide_menu'| translate}}" id="hideMainMenuLink"><i class="fa fa-arrow-left leftBarIcon"></i></a>
-        <a href="javascript:dhis2.leftBar.extendAnimated()" title="{{'extend_menu'| translate}}" id="extendMainMenuLink"><i class="fa fa-arrow-right leftBarIcon"></i></a>
-    </div>
-    <div class="left-bar-menu" ng-controller="LeftBarMenuController">
-        <ul class="nav nav-pills nav-stacked">
-            <li><a href ng-click="showHome()">{{'registration_and_data_entry'| translate}}</a></li>
-            <li><a href ng-click="showReportTypes()">{{'reports'| translate}}</a></li>
-        </ul>
-    </div>
-    <div style="margin-top:20px">
-        <img id="searchIcon" src="../images/search.png" style="cursor: pointer" title="{{searchOusLabel}}">
-        <span id="searchSpan" style="width:100%;display:none;">
-            <input type="text" id="searchField" name="key"/>
-            <input type="button" value="{{findLabel}}" onclick="selection.findByName()"/>
-        </span>
-    </div>
-    <div id="orgUnitTree">
-        <ul>
-        </ul>
-    </div>
-    <img id="ouwt_loader" src="../images/ajax-loader-bar.gif"/>
-    <div class="small-horizonal-spacing" ng-if="!treeLoaded">
-        {{'loading_tree'| translate}}
-    </div>
+<div id="hideLeftBar">
+    <a href="index.action" title="{{'show_main_menu'| translate}}" id="showMainMenuLink"><i class="fa fa-home leftBarIcon"></i></a>
+    <a href="javascript:dhis2.leftBar.hideAnimated()" title="{{'hide_menu'| translate}}" id="hideMainMenuLink"><i class="fa fa-arrow-left leftBarIcon"></i></a>
+    <a href="javascript:dhis2.leftBar.extendAnimated()" title="{{'extend_menu'| translate}}" id="extendMainMenuLink"><i class="fa fa-arrow-right leftBarIcon"></i></a>
+</div>
+<div class="left-bar-menu" ng-controller="LeftBarMenuController">
+    <ul class="nav nav-pills nav-stacked">
+        <li><a href ng-click="showHome()">{{'registration_and_data_entry'| translate}}</a></li>
+        <li><a href ng-click="showReportTypes()">{{'reports'| translate}}</a></li>
+    </ul>
+</div>
+<div style="margin-top:20px">
+    <img id="searchIcon" src="../images/search.png" style="cursor: pointer" title="{{searchOusLabel}}">
+    <span id="searchSpan" style="width:100%;display:none;">
+        <input type="text" id="searchField" name="key"/>
+        <input type="button" value="{{findLabel}}" onclick="selection.findByName()"/>
+    </span>
 </div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js	2015-10-20 14:01:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js	2015-10-21 10:04:51 +0000
@@ -67,7 +67,7 @@
                         });
                     }
                     else{
-                        $(document).one("ouwtLoaded", function () {
+                    	 $( '#orgUnitTree' ).one( 'ouwtLoaded', function( event, ids, names ){
                             console.log('Finished loading orgunit tree');
                             //Disable ou selection until meta-data has downloaded
                             $("#orgUnitTree").addClass("disable-clicks");