Commit e554bd8b20e6e52c933aedc90449179856fbf1b3

Authored by Nikita Kulshreshtha
1 parent 00de6fce

open view issue is fixed. Need to check on server.

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -472,7 +472,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -472,7 +472,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
472 url: 'app/views/da/da-view.html' 472 url: 'app/views/da/da-view.html'
473 }, 473 },
474 title: localStorage.getItem("currentViewTitle"), 474 title: localStorage.getItem("currentViewTitle"),
475 - 475 +
476 position: { 476 position: {
477 top: 70, 477 top: 70,
478 left: 1, 478 left: 1,
@@ -482,6 +482,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -482,6 +482,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
482 482
483 }); 483 });
484 484
  485 + console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel'))
485 //0.1 486 //0.1
486 $rootScope.currentSlug = 'da-body-view'; 487 $rootScope.currentSlug = 'da-body-view';
487 488
@@ -496,35 +497,41 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -496,35 +497,41 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
496 //0.3 497 //0.3
497 var daBodyviewElement = angular.element(document.getElementById("daBodyview")); 498 var daBodyviewElement = angular.element(document.getElementById("daBodyview"));
498 499
499 - $timeout(function () { $compile(daBodyviewElement.contents())($scope) }, 250); 500 + $timeout(function () {
  501 + $compile(daBodyviewElement.contents())($scope);
500 502
  503 + console.log('html is compiled' + document.getElementById('daView'))
  504 + if (document.getElementById('daView') != null) {
501 505
502 - //0.4 added some stylesheets  
503 - $('#daBodyview').css("height", $(window).outerHeight()); 506 + //0.4 added some stylesheets
  507 + $('#daBodyview').css("height", $(window).outerHeight());
504 508
505 - $('#daBodyview').css("width", $(window).outerWidth()); 509 + $('#daBodyview').css("width", $(window).outerWidth());
506 510
507 - //1. load navigator man first  
508 - $scope.LoadBodyViewNavigatorImage(); 511 + //1. load navigator man first
  512 + console.log('before LoadBodyViewNavigatorImage call')
  513 + $scope.LoadBodyViewNavigatorImage();
509 514
510 - //$scope.loadSearchDataForBodyView(); 515 + //$scope.loadSearchDataForBodyView();
511 516
512 - $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); 517 + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
513 518
514 - $scope.layerNumber = 0; 519 + $scope.layerNumber = 0;
515 520
516 - //2. 521 + //2.
517 522
518 - console.log('currentBodyViewId just before sending: ' + currentBodyViewId);  
519 - $scope.loadBodyViewData(currentBodyViewId); 523 + console.log('currentBodyViewId just before sending: ' + currentBodyViewId);
  524 + $scope.loadBodyViewData(currentBodyViewId);
520 525
521 - //2. load bodyRegion data  
522 - $rootScope.isLoading = true;  
523 - $rootScope.voId = localStorage.getItem("currentBodyViewId"); 526 + //2. load bodyRegion data
  527 + $rootScope.isLoading = true;
  528 + $rootScope.voId = localStorage.getItem("currentBodyViewId");
524 529
525 - $('#daBodyview').css("height", $(window).outerHeight()); 530 + $('#daBodyview').css("height", $(window).outerHeight());
526 531
527 - $('#daBodyview').css("width", $(window).outerWidth()); 532 + $('#daBodyview').css("width", $(window).outerWidth());
  533 + }
  534 + }, 250);
528 } 535 }
529 536
530 angular.element(document).ready(function () { 537 angular.element(document).ready(function () {
@@ -632,6 +639,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -632,6 +639,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
632 639
633 //Code for displaying NavigatorImage for BodyView 640 //Code for displaying NavigatorImage for BodyView
634 $scope.LoadBodyViewNavigatorImage = function () { 641 $scope.LoadBodyViewNavigatorImage = function () {
  642 + console.log('insideLoadBodyViewNavigatorImage')
635 var NavigatorManJsonPath = '~/../content/data/json/da/da_dat_orient_image.json'; 643 var NavigatorManJsonPath = '~/../content/data/json/da/da_dat_orient_image.json';
636 644
637 $http({ method: 'GET', url: NavigatorManJsonPath }) 645 $http({ method: 'GET', url: NavigatorManJsonPath })
@@ -698,7 +706,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -698,7 +706,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
698 706
699 707
700 $scope.LoadDefaultLayerImage = function () { 708 $scope.LoadDefaultLayerImage = function () {
701 - 709 + console.log('inside LoadDefaultLayerImage')
702 $rootScope.isNormalMode = true; 710 $rootScope.isNormalMode = true;
703 711
704 $scope.layerNumber = 0; 712 $scope.layerNumber = 0;
@@ -777,8 +785,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -777,8 +785,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
777 $rootScope.BodyRegionCordinatesData = []; // create an empty array 785 $rootScope.BodyRegionCordinatesData = []; // create an empty array
778 786
779 $('#daBodyview').css('width', '100%'); 787 $('#daBodyview').css('width', '100%');
780 - $('#canvasDiv').css('height', $('#daImagePanel').outerHeight() - 104)  
781 - //$('#canvasDiv').css('width', $('#daImagePanel').outerWidth() - 100) 788 + var canvasDIvHeight = parseInt($('#daImagePanel').outerHeight()) - 104;
  789 + $('#canvasDiv').css('height', canvasDIvHeight);
782 $('#leftToolBar').css('height', $('#daImagePanel').outerHeight()) 790 $('#leftToolBar').css('height', $('#daImagePanel').outerHeight())
783 791
784 792