From 7d0b9fe07df9b3e40c78cf156f4d71e0429af7c3 Mon Sep 17 00:00:00 2001
From: unknown <Ayush.Jain@NOIAYJAALL.indiaebix.com>
Date: Tue, 20 Sep 2016 12:47:24 +0530
Subject: [PATCH] Manually Merged code for Transparency

---
 .gitignore                                                  | 70 +++++++++++++++++++++++++++++++++++-----------------------------------
 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 24 +++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index e7c26cd..6e642df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,38 +1,38 @@
-# git ignore file
-[Bb]in/
-[Dd]ebug*/
-*.lib
-Thumbs.db
-obj/
-*.obj
-*.exe
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*_i.c
-*_p.c
-*.ncb
-*.suo
-*.sln.docstates
-*.tlb
-*.tlh
-*.bak
-*.cache
-*.ilk
-*.log
-[Bb]in
-[Dd]ebug*/
-*.lib
-*.sbr
-obj/
-[Rr]elease*/
-_ReSharper*/
-[Tt]est[Rr]esult*
-*.vssscc
-$tf*/
-400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user
+# git ignore file
+[Bb]in/
+[Dd]ebug*/
+*.lib
+Thumbs.db
+obj/
+*.obj
+*.exe
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.sln.docstates
+*.tlb
+*.tlh
+*.bak
+*.cache
+*.ilk
+*.log
+[Bb]in
+[Dd]ebug*/
+*.lib
+*.sbr
+obj/
+[Rr]elease*/
+_ReSharper*/
+[Tt]est[Rr]esult*
+*.vssscc
+$tf*/
+400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user
 300-PROTOTYPES/POC/AIAHTML5
 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig
 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js.orig
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index a28909f..31b25bb 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -4691,7 +4691,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     $scope.enableZoom = function () {
 
-
+        $("#btnExtract").removeClass("disabled");
+        $("#btnTranparency").removeClass("disabled");
+        $rootScope.isTransparencyBoxActivated = false;
+        $rootScope.isNormalMode = false;
         //if listanager is visisble then close it
 
         $rootScope.CloseListManager();
@@ -4824,6 +4827,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.enableHighlight = function () {
 
 
+        //  $("#btnExtract").removeClass("disabled");
+       //   $("#btnTranparency").removeClass("disabled");
+       //   $rootScope.isTransparencyBoxActivated = false;
+       //  $rootScope.isNormalMode = false;
+
         //if listanager is visisble then close it
 
         //  $rootScope.isListManagerSelected = false;
@@ -5513,6 +5521,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     $scope.OnGenderChange = function (event) {
 
+
+
+        $("#btnExtract").removeClass("disabled");
+        $("#btnTranparency").removeClass("disabled");
+        $rootScope.isTransparencyBoxActivated = false;
+        $rootScope.isNormalMode = false;
+
         //if listanager is visisble then close it
        
        // $rootScope.isListManagerSelected = false;
@@ -5692,6 +5707,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
     $scope.OnViewChange = function (event) {
 
+
+        $("#btnExtract").removeClass("disabled");
+        $("#btnTranparency").removeClass("disabled");
+        $rootScope.isTransparencyBoxActivated = false;
+        $rootScope.isNormalMode = false;
+
+
         //if listanager is visisble then close it
 
         //$rootScope.isListManagerSelected = false;
--
libgit2 0.21.4