From c935ddfc6e0b3b388edd26b9bdb496758c1a1862 Mon Sep 17 00:00:00 2001
From: nikita <nikita.kulshreshtha@ebix.com>
Date: Tue, 30 Aug 2016 11:20:19 +0530
Subject: [PATCH] anootation toolbar edit shape style code. fixed duplicate entry in body system in list manager.

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js   | 15 +++------------
 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 26 ++++++++++----------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 04df852..9740db1 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -6701,7 +6701,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
             var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
 
-            //var systemListHtml = '<option value="0" selected="">All</option>'
+            $('#bodySystems').empty();
 
             var $all = $('<option ng-click=refreshTermListOnSystemSelection($event) id="0" selected="">All</option>').appendTo('#bodySystems');
             $compile($all)($scope);
@@ -6710,11 +6710,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
                 var $elem = $('<option ng-click=refreshTermListOnSystemSelection($event) id="' + value._BodySystemId + '"  title="' + value._Name + '" >' + value._Name + '</option>').appendTo('#bodySystems');
                 $compile($elem)($scope);
-                // systemListHtml = systemListHtml + '<<option id="' + value._BodySystemId + '"  title="' + value._Name + '" ng-click=" $scope.refreshTermListOnSystemSelection(event)">' + value._Name + '</option>'
             })
 
 
-            // $('#bodySystems').append(systemListHtml);
 
 
             var currentView = localStorage.getItem("currentViewTitle");
@@ -6729,15 +6727,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $rootScope.viewOrientationId = currentOpenViewId;
             //confirm that this is DA module which is last open
             if (currentOpenModuleId == 1) {
-                //$http({ method: 'GET', url: '~/../content/data/json/da/body-views/' + currentOpenViewId + '/da_dat_tm_sg_' + currentOpenViewId + '.json' }).success(function (data) {
-                //    $rootScope.TermNumberData = data;
-                //    var actualtermList = new jinqJs()
-                //                        .from($rootScope.TermNumberData.TermData.Term)
-                //                        .select('_ActualTermNumber');
-
-                //    var TermTextList = [];
-                //    var TermTextList = [];
-
+             
+                $('#termList').empty();
                 $scope.loadListManger();
 
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index f5752e5..e63a75e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -257,26 +257,20 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         $rootScope.shapestyleOpacity = 1;
         $rootScope.shapestyleFillColor = "#fff";
         $rootScope.shapestyleFillBorderColor = "black";
-        $rootScope.shapestyleborderWidth=2;
-
+        $rootScope.shapestyleborderWidth = 2;
+        $rootScope.shapestyleborderStyles = "solid";
         $rootScope.shapestyle = function (id) {
 
             $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
             $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
-            $rootScope.shapestyleFillBorderColor = $("#" + id).parent().css('border');
-            var a = $rootScope.shapestyleFillBorderColor;
-            var b = a.split("px");
-            //  alert(b);
-            $rootScope.shapestyleborderWidth = b[0];
-          
-         //  alert(b[0]);
-            //alert(b[1]);
-            var c = b[1].split("solid");
-          //  alert(c[1]);
-            $rootScope.shapestyleborderColor = c[1];
-
-
-            //     alert($rootScope.shapestyleFillColor);
+            $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
+            $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
+            var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
+            var intPart = pixelSeparation.split("p");
+
+            $rootScope.shapestyleborderWidth = intPart[0];
+            $rootScope.shapestyleborderStyles = "solid";
+
             $('#editshapestyle').modal('hide');
         }
 
--
libgit2 0.21.4