Commit 8de220fac2b567a53d9050ef0892879ba3b88f7a

Authored by Amrita Vishnoi
1 parent fadaa871

Trying to resolve scope Issue on AA

400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -83,15 +83,54 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod @@ -83,15 +83,54 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod
83 $location.url('/module-item-view'); 83 $location.url('/module-item-view');
84 } 84 }
85 85
86 - 86 + $scope.openBodyView = function () {
87 87
88 - $scope.getImgUrl = function () { 88 +
  89 + $.jsPanel({
  90 + id: 'daImagePanel',
  91 + selector: '.daBodyView',
  92 + theme: 'success',
  93 + currentController: 'TileViewListController',
  94 + parentSlug: 'tile-view-list',
  95 + ajax: {
  96 + url: 'app/views/aa/atlas-anatomy-detail.html'
  97 + },
  98 + // title: localStorage.getItem("currentViewTitle"),
89 99
90 - alert('called...')  
91 - // $scope.myImgUrl = $rootScope.OpenItemImageName;  
92 - //alert('getImgurl: ' + $scope.myImgUrl); 100 + position: {
  101 + top: 70,
  102 + left: 1,
  103 + },
  104 +
  105 + size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
  106 +
  107 + });
  108 +
  109 + console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel'))
93 110
  111 + var daBodyviewElement = angular.element(document.getElementById("aaDetailPageDiv"));
94 112
  113 + $timeout(function () {
  114 +
  115 + $compile(daBodyviewElement.contents())($scope);
  116 +
  117 + console.log('html is compiled' + document.getElementById('aaDetailPageDiv'))
  118 + if (document.getElementById('aaDetailPageDiv') != null) {
  119 +
  120 + //0.4 added some stylesheets
  121 + $('#daBodyview').css("height", $(window).outerHeight());
  122 +
  123 + $('#daBodyview').css("width", $(window).outerWidth());
  124 +
  125 +
  126 + }
  127 + }, 250);
  128 + }
  129 +
  130 +
  131 + $scope.getImgUrl = function () {
  132 +
  133 + alert('called...')
95 } 134 }
96 135
97 $scope.openModuleItem = function (elSelector) 136 $scope.openModuleItem = function (elSelector)
@@ -154,16 +193,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod @@ -154,16 +193,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod
154 $scope.addPinDataCanvas(); 193 $scope.addPinDataCanvas();
155 } 194 }
156 195
157 -  
158 196
159 }, 250); 197 }, 250);
160 -  
161 -  
162 -  
163 -  
164 -  
165 - //document.getElementById('aaDetailPageDiv').appendChild(imgCanvas);  
166 -  
167 } 198 }
168 199
169 200
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
1  1 
2 <div id="aaDetailPageDiv" class="bodyWrap row" ng-controller="TileViewListController"> 2 <div id="aaDetailPageDiv" class="bodyWrap row" ng-controller="TileViewListController">
3 3
4 - <!--<div class="col-sm-12 pageHeading">  
5 - <!--<button type="button" class="btn btn-success pull-left toggleBar btn-sm" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </button>-->  
6 - <!--<div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-exchange"></i> </div>-->  
7 - <!--<h4 class="pull-left">1<sup>st</sup> &amp; 2<sup>nd</sup> Intercostal Spaces</h4>-->  
8 - <!--<div class="pull-right btn-group paddTop4 hidden-xs"> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-clone"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a> </div>  
9 - <div class="clearfix"></div>-->  
10 - <!--</div>-->  
11 <div class="tools pull-left" style="top:44px;"> 4 <div class="tools pull-left" style="top:44px;">
12 <div class="toggle-icon toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div> 5 <div class="toggle-icon toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div>
13 <div class=""> 6 <div class="">
@@ -48,15 +41,7 @@ @@ -48,15 +41,7 @@
48 <div class=""> 41 <div class="">
49 <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left"> 42 <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
50 <input class="form-control input-sm " type="text" ng-click="alert('hi search')" placeholder="Anterior cutaneous branch of first intercostal nerve"> 43 <input class="form-control input-sm " type="text" ng-click="alert('hi search')" placeholder="Anterior cutaneous branch of first intercostal nerve">
51 - <!--<select class="form-control input-sm ">  
52 - <option>---Select---</option>  
53 - <option selected>Anterior cutaneous branch of first intercostal nerve</option>  
54 - <option>Anterior cutaneous branch of second intercostal nerve</option>  
55 - <option>Anterior cutaneous branch of third intercostal nerve</option>  
56 - <option>Anterior intercostal artery</option>  
57 - <option>Anterior intercostal vein</option>  
58 - </select>-->  
59 - <!--<div class="input-group-addon btn btn-primary btn-sm"></div>--> 44 +
60 </div> 45 </div>
61 &nbsp; 46 &nbsp;
62 <!-- Single button --> 47 <!-- Single button -->
@@ -97,11 +82,11 @@ @@ -97,11 +82,11 @@
97 </div> 82 </div>
98 </div> 83 </div>
99 84
100 -  
101 - </div>  
102 85
103 </div> 86 </div>
  87 +
104 </div> 88 </div>
  89 +</div>
105 90
106 <script> 91 <script>
107 $(window).load(function () { 92 $(window).load(function () {
@@ -129,7 +114,7 @@ @@ -129,7 +114,7 @@
129 $('[data-toggle="tooltip"]').tooltip(); 114 $('[data-toggle="tooltip"]').tooltip();
130 }); 115 });
131 </script> 116 </script>
132 - <script src="js/jquery-ui-slider-pips.js"></script> 117 + <script src="../../../libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
133 <script> 118 <script>
134 $(".slider") 119 $(".slider")
135 120
400-SOURCECODE/AIAHTML5.Web/app/views/module-item-view.html
1 -<div ng-controller="TileViewListController"> 1 +<div>
2 <div ng-include="aap/widget/MainMenu.html"></div> 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 - <div ng-init="openModuleItem('.jsPanelContainer')" id="jsPanelContainer" class="JsPannelContainer"></div> 3 + <div ng-init="openBodyView()" id="" class="daBodyView" ng-controller="TileViewListController"></div>
4 <!--<div > 4 <!--<div >
5 5
6 </div>--> 6 </div>-->
7 -</div>  
8 \ No newline at end of file 7 \ No newline at end of file
  8 +</div>