From 005bac88720a0c1d3f55ec81de64e8597c28c2d8 Mon Sep 17 00:00:00 2001
From: mitali <mitali.srivastava@ebix.com>
Date: Tue, 23 Aug 2016 11:47:45 +0530
Subject: [PATCH] Bug #5775:Product code is displaying while clicking on go button.

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js   | 19 ++++++++++++++++---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js |  7 +++++--
 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html         |  3 ++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index f4b54c3..89ce57f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -440,6 +440,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
         $scope.loadSearchDataForBodyView();
 
+        $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
+
         //2.
 
         console.log('currentBodyViewId just before sending: ' + currentBodyViewId);
@@ -456,7 +458,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     angular.element(document).ready(function () {
 
-
     })
 
 
@@ -5239,6 +5240,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                      canDiv.innerHTML = '';
                  }
                  $scope.CalculateImageCordinates($rootScope.viewOrientationId);
+                 $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
              },
               function (error) {
                   // handle errors here
@@ -5282,6 +5284,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 //2. load corresponding navigator man
                 $scope.loadSelectedBodyViewNavigator($rootScope.voId);
 
+                //3.Change the popup title next to search
+                $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
+
             };
 
 
@@ -5400,10 +5405,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //  $scope.layerNumber = 0;
         //  debugger;
 
-        $scope.loadSelectedBodyView($scope.ReloadBodyViewId);
+        console.log('reloadDABodyViewEvent ' + $scope.ReloadBodyViewId);
+
+        if ($rootScope.isSettingEventAlredayDispachted == true) {
 
-        $scope.loadSelectedBodyViewNavigator($scope.ReloadBodyViewId);
+            $scope.loadSelectedBodyView($scope.ReloadBodyViewId);
 
+            $scope.loadSelectedBodyViewNavigator($scope.ReloadBodyViewId);
+
+            $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
+
+            $rootScope.isSettingEventAlredayDispachted = false;
+        }
 
     })
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index a50c5d4..737f76e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -456,12 +456,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
             //1.
             if (typeof (setting.ethnicity) !== "undefined" && setting.ethnicity !== null) {
+                $rootScope.ChangeEthnicity(setting, setting.ethnicity);
                 $rootScope.globalSetting.ethnicity = setting.ethnicity;
-                $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
+                //$rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
             }
             if (typeof (setting.modesty) !== "undefined" && setting.modesty !== null) {
+                $rootScope.ChangeEthnicity(setting, setting.ethnicity);
                 $rootScope.globalSetting.modesty = setting.modesty;
-                $rootScope.setModestySettings($rootScope.globalSetting.modesty);
+                //$rootScope.setModestySettings($rootScope.globalSetting.modesty);
             }
 
             //2.
@@ -488,6 +490,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                 if ($rootScope.openViews.length > 0) {
                     var openViewLen = $rootScope.openViews.length;
                     var currentOpenViewId = $rootScope.openViews[openViewLen - 1].BodyViewId;
+                    $rootScope.isSettingEventAlredayDispachted = true;
                     $rootScope.$broadcast('reloadDABodyViewEvent', { reloadDABodyViewId: currentOpenViewId });
                 }
                 else {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
index e2e0638..d3f7fd9 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -201,7 +201,8 @@
                         
                         <div id="backdrop" ng-show="IsSearchVisible">
                             <div class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
-                                <ul id="termlistfilter" class="form-control dropdown-menu" style="height:100px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
+                                <!--#Bug 6591-->
+                                <ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
                                     <li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">
                                         <a id="{{item._ActualTermNumber}}" href="" ng-click="jumpToTerm($event)">{{item._TermText}}</a>
                                     </li>
--
libgit2 0.21.4