ADAM / AIAHTML5

Commit c935ddfc6e0b3b388edd26b9bdb496758c1a1862

Authored by Nikita Kulshreshtha
1 parent 925fe9f5

anootation toolbar edit shape style code. 

fixed duplicate entry in body system in list manager.
Inline Side-by-side
Showing 2 changed files with 13 additions and 28 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @c935ddf
... ... @@ -6701,7 +6701,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6701 6701  
6702 6702 var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
6703 6703  
6704   - //var systemListHtml = '<option value="0" selected="">All</option>'
  6704 + $('#bodySystems').empty();
6705 6705  
6706 6706 var $all = $('<option ng-click=refreshTermListOnSystemSelection($event) id="0" selected="">All</option>').appendTo('#bodySystems');
6707 6707 $compile($all)($scope);
... ... @@ -6710,11 +6710,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6710 6710  
6711 6711 var $elem = $('<option ng-click=refreshTermListOnSystemSelection($event) id="' + value._BodySystemId + '" title="' + value._Name + '" >' + value._Name + '</option>').appendTo('#bodySystems');
6712 6712 $compile($elem)($scope);
6713   - // systemListHtml = systemListHtml + '<<option id="' + value._BodySystemId + '" title="' + value._Name + '" ng-click=" $scope.refreshTermListOnSystemSelection(event)">' + value._Name + '</option>'
6714 6713 })
6715 6714  
6716 6715  
6717   - // $('#bodySystems').append(systemListHtml);
6718 6716  
6719 6717  
6720 6718 var currentView = localStorage.getItem("currentViewTitle");
... ... @@ -6729,15 +6727,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6729 6727 $rootScope.viewOrientationId = currentOpenViewId;
6730 6728 //confirm that this is DA module which is last open
6731 6729 if (currentOpenModuleId == 1) {
6732   - //$http({ method: 'GET', url: '~/../content/data/json/da/body-views/' + currentOpenViewId + '/da_dat_tm_sg_' + currentOpenViewId + '.json' }).success(function (data) {
6733   - // $rootScope.TermNumberData = data;
6734   - // var actualtermList = new jinqJs()
6735   - // .from($rootScope.TermNumberData.TermData.Term)
6736   - // .select('_ActualTermNumber');
6737   -
6738   - // var TermTextList = [];
6739   - // var TermTextList = [];
6740   -
  6730 +
  6731 + $('#termList').empty();
6741 6732 $scope.loadListManger();
6742 6733  
6743 6734  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @c935ddf
... ... @@ -257,26 +257,20 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
257 257 $rootScope.shapestyleOpacity = 1;
258 258 $rootScope.shapestyleFillColor = "#fff";
259 259 $rootScope.shapestyleFillBorderColor = "black";
260   - $rootScope.shapestyleborderWidth=2;
261   -
  260 + $rootScope.shapestyleborderWidth = 2;
  261 + $rootScope.shapestyleborderStyles = "solid";
262 262 $rootScope.shapestyle = function (id) {
263 263  
264 264 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
265 265 $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
266   - $rootScope.shapestyleFillBorderColor = $("#" + id).parent().css('border');
267   - var a = $rootScope.shapestyleFillBorderColor;
268   - var b = a.split("px");
269   - // alert(b);
270   - $rootScope.shapestyleborderWidth = b[0];
271   -
272   - // alert(b[0]);
273   - //alert(b[1]);
274   - var c = b[1].split("solid");
275   - // alert(c[1]);
276   - $rootScope.shapestyleborderColor = c[1];
277   -
278   -
279   - // alert($rootScope.shapestyleFillColor);
  266 + $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
  267 + $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
  268 + var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
  269 + var intPart = pixelSeparation.split("p");
  270 +
  271 + $rootScope.shapestyleborderWidth = intPart[0];
  272 + $rootScope.shapestyleborderStyles = "solid";
  273 +
280 274 $('#editshapestyle').modal('hide');
281 275 }
282 276  
... ...