ADAM / AIAHTML5

Commit 1461deb21722c4d8dc68744ac6d3eb8258a042f3

Authored by Amrita Vishnoi
1 parent 675ce92b

Some AA bug fixes-

Inline Side-by-side
Showing 6 changed files with 64 additions and 63 deletions
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
View file @1461deb
No preview for this file type
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
View file @1461deb
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @1461deb
... ... @@ -569,7 +569,6 @@
569 569 <Content Include="content\data\json\aa\aa_pindata\aa_dat_pindata_3332.json" />
570 570 <Content Include="content\data\json\aa\aa_pindata\aa_dat_pindata_3333.json" />
571 571 <Content Include="content\data\json\aa\aa_pindata\aa_dat_pindata_3334.json" />
572   - <Content Include="content\data\json\aa\aa_dat_term.json" />
573 572 <None Include="content\data\json\da\body-views\10\da_dat_tm_sg_10.json" />
574 573 <Content Include="content\data\json\da\body-views\12\da_dat_layer_12.json" />
575 574 <Content Include="content\data\json\da\body-views\12\da_dat_tm_sg_12.json" />
... ... @@ -593,16 +592,15 @@
593 592 <None Include="content\data\json\da\body-views\8\da_dat_tm_sg_8.json" />
594 593 <Content Include="content\data\json\da\body-views\9\da_dat_body_system_term_9.json" />
595 594 <None Include="content\data\json\da\body-views\9\da_dat_tm_sg_9.json" />
596   - <Content Include="content\data\json\da\vocab\English_Undergraduate\cm_dat_vocabterm_2.json" />
597   - <Content Include="content\data\json\da\vocab\English\cm_dat_vocabterm_1.json" />
  595 + <Content Include="content\data\json\da\vocab\English %28Undergraduate%29\cm_dat_vocabterm_2.json" />
598 596 <None Include="content\data\json\da\vocab\German\cm_dat_vocabterm_4.json" />
599 597 <None Include="content\data\json\da\vocab\Spanish\cm_dat_vocabterm_5.json" />
600 598 <None Include="content\data\json\da\vocab\Hungarian\cm_dat_vocabterm_6.json" />
601 599 <None Include="content\data\json\da\vocab\Italian\cm_dat_vocabterm_7.json" />
602 600 <None Include="content\data\json\da\vocab\French\cm_dat_vocabterm_8.json" />
603 601 <None Include="content\data\json\da\vocab\Portuguese\cm_dat_vocabterm_9.json" />
604   - <None Include="content\data\json\da\vocab\Japanese_Kanji\cm_dat_vocabterm_10.json" />
605   - <None Include="content\data\json\da\vocab\Japanese_yomi\cm_dat_vocabterm_11.json" />
  602 + <None Include="content\data\json\da\vocab\Japanese %28Kanji%29\cm_dat_vocabterm_10.json" />
  603 + <None Include="content\data\json\da\vocab\japanese %28yomi%29\cm_dat_vocabterm_11.json" />
606 604 <Content Include="content\images\1.jpg" />
607 605 <Content Include="content\images\1000x600.jpg" />
608 606 <Content Include="content\images\3da\thumbnails\3d_tni_3347.jpg" />
... ... @@ -44717,6 +44715,7 @@
44717 44715 <Content Include="themes\default\css\bootstrap\fonts\glyphicons-halflings-regular.woff" />
44718 44716 <Content Include="themes\default\css\bootstrap\fonts\glyphicons-halflings-regular.woff2" />
44719 44717 <Content Include="content\images\Thumbs.db" />
  44718 + <Content Include="content\data\json\da\vocab\english\cm_dat_vocabterm_1.json" />
44720 44719 <Content Include="content\data\json\da\da_dat_brview.json" />
44721 44720 <Content Include="content\data\json\da\da_dat_contentlist.json" />
44722 44721 <Content Include="libs\jquery\jquery_plugin\jsPanel\jspanel\fonts\jsglyph.eot" />
... ...
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user
  View file @1461deb
1   -<?xml version="1.0" encoding="utf-8"?>
  1 +<?xml version="1.0" encoding="utf-8"?>
2 2 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3 <PropertyGroup>
4 4 <ProjectView>ProjectFiles</ProjectView>
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @1461deb
... ... @@ -100,71 +100,73 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
100 100  
101 101 }
102 102  
103   - $.jsPanel({
104   - id: 'ImagePanel',
105   - selector: '.aaBodyView',
106   - theme: 'success',
107   - currentController: 'TileViewListController',
108   - parentSlug: 'tile-view',
109   - ajax: {
110   - url: jsContentURL
111   - },
112   - title: localStorage.getItem("currentViewTitle"),
  103 + //1. create a jsPanel and load the module item view
  104 + if ($rootScope.moduleName == ATLAS_ANATOMY) {
  105 + $.jsPanel({
  106 + id: 'ImagePanel',
  107 + selector: '.aaBodyView',
  108 + theme: 'success',
  109 + currentController: 'TileViewListController',
  110 + parentSlug: 'tile-view-list',
  111 + ajax: {
  112 + url: jsContentURL
  113 + },
  114 + title: localStorage.getItem("currentViewTitle"),
113 115  
114   - position: {
115   - top: 70,
116   - left: 1,
117   - },
  116 + position: {
  117 + top: 70,
  118 + left: 1,
  119 + },
118 120  
119   - size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
  121 + size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
120 122  
121   - });
  123 + });
122 124  
123   - console.log('jsPanel loaded ImagePanel exist= ' + document.getElementById('ImagePanel'))
  125 + console.log('jsPanel loaded ImagePanel exist= ' + document.getElementById('ImagePanel'))
124 126  
125   - //0.3
126   - var aaViewElement = angular.element(document.getElementById(moduleItemViewDivId));
  127 + //0.3
  128 + var aaViewElement = angular.element(document.getElementById(moduleItemViewDivId));
127 129  
128   - //0.4 for Opening module item, load it into image
129   - var openedImage = new Image();
130   - openedImage.name = $rootScope.OpenItemImagePath;
131   - openedImage.onload = getImageHeightWidth;
132   - openedImage.onerror = loadFailure;
133   - openedImage.src = $rootScope.OpenItemImagePath;
  130 + //0.4 for Opening module item, load it into image
  131 + var openedImage = new Image();
  132 + openedImage.name = $rootScope.OpenItemImagePath;
  133 + openedImage.onload = getImageHeightWidth;
  134 + openedImage.onerror = loadFailure;
  135 + openedImage.src = $rootScope.OpenItemImagePath;
134 136  
135   - $timeout(function () {
136   - $compile(aaViewElement.contents())($scope);
  137 + $timeout(function () {
  138 + $compile(aaViewElement.contents())($scope);
137 139  
138   - if (document.getElementById('aaDetailPageDiv') != null) {
  140 + if (document.getElementById('aaDetailPageDiv') != null) {
139 141  
140   - //0.4 added some stylesheets
141   - $('#aaBodyView').css("height", $(window).outerHeight());
142   - $('#aaBodyView').css("width", $(window).outerWidth());
  142 + //0.4 added some stylesheets
  143 + $('#aaBodyView').css("height", $(window).outerHeight());
  144 + $('#aaBodyView').css("width", $(window).outerWidth());
143 145  
144   - $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
145   - $("#modItemImage").attr('src', $rootScope.OpenItemImagePath);
  146 + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
  147 + $("#modItemImage").attr('src', $rootScope.OpenItemImagePath);
146 148  
147   - //0.5 create canvas on the top of image so that I can draw a line over the canvas.
148   - var canvas = document.createElement('canvas');
149   - canvas.id = 'aaDetailViewCanvas';
150   - canvas.height = parseInt(($scope.imageHeight));
151   - canvas.width = parseInt($scope.imageWidth);
152   - canvas.style.left = '0px';
153   - canvas.style.top = '0px';
154   - canvas.style.position = "absolute";
  149 + //0.5 create canvas on the top of image so that I can draw a line over the canvas.
  150 + var canvas = document.createElement('canvas');
  151 + canvas.id = 'aaDetailViewCanvas';
  152 + canvas.height = parseInt(($scope.imageHeight));
  153 + canvas.width = parseInt($scope.imageWidth);
  154 + canvas.style.left = '0px';
  155 + canvas.style.top = '0px';
  156 + canvas.style.position = "absolute";
155 157  
156   - $("#imageDiv").append(canvas);
157   - $scope.context = canvas.getContext("2d")
  158 + $("#imageDiv").append(canvas);
  159 + $scope.context = canvas.getContext("2d")
158 160  
159   - //6. Show all pins on AA opened item
160   - $scope.showAllPins();
161   - //7. Highlight all system body list in left side
162   - $scope.highlightBodySystemList();
163   - }
164   - }, 1050);
  161 + //6. Show all pins on AA opened item
  162 + $scope.showAllPins();
  163 + //7. Highlight all system body list in left side
  164 + $scope.highlightBodySystemList();
  165 + }
  166 + }, 1050);
  167 + }
165 168 }
166 169  
167   -
168 170 $scope.highlightBodySystemList = function () {
169 171 $rootScope.bodySystemNames = $rootScope.bodySystemName.trim().split(/\s*,\s*/);
170 172 var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
... ... @@ -173,7 +175,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
173 175 //var boldTag = lis[i];
174 176 for (var j = 0; j < $rootScope.bodySystemNames.length; j++) {
175 177 if ((bodySystemListObj[i].innerHTML) == ($rootScope.bodySystemNames[j])) {
176   - $("#" + i).removeClass("disabled");
  178 + $("#" + i).parent().removeClass("disabled");
177 179  
178 180 }
179 181 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @1461deb
... ... @@ -20,17 +20,17 @@
20 20 <ul class="dropdown-menu" aria-labelledby="dropdownMenu221" id="bodySystemList">
21 21 <li><a href="#" title="Current Structure">All</a></li>
22 22 <li role="separator" class="divider"></li>
23   - <li><a id="1" href="#" title="Cardiovascular" onclick="showSelectedSystemPins(event)">Cardiovascular</a></li>
24   - <li><a id="2" href="#" title="Digestive" onclick="showSelectedSystemPins(event)">Digestive</a></li>
  23 + <li class="disabled"><a id="1" href="#" title="Cardiovascular" onclick="showSelectedSystemPins(event)">Cardiovascular</a></li>
  24 + <li class="disabled"><a id="2" href="#" title="Digestive" onclick="showSelectedSystemPins(event)">Digestive</a></li>
25 25 <li class="disabled"><a id="3" href="#" title="Endocrine" onclick="showSelectedSystemPins(event)">Endocrine</a></li>
26   - <li ><a id="4" href="#" title="Immune" onclick="showSelectedSystemPins(event)">Immune</a></li>
  26 + <li class="disabled"><a id="4" href="#" title="Immune" onclick="showSelectedSystemPins(event)">Immune</a></li>
27 27 <li class="disabled"><a id="5" href="#" title="Integumentary" onclick="showSelectedSystemPins(event)">Integumentary</a></li>
28 28 <li class="disabled"><a id="6" href="#" title="Lymphatic" onclick="showSelectedSystemPins(event)">Lymphatic</a></li>
29   - <li><a id="7" href="#" title="Muscular" onclick="showSelectedSystemPins(event)">Muscular</a></li>
  29 + <li class="disabled"><a id="7" href="#" title="Muscular" onclick="showSelectedSystemPins(event)">Muscular</a></li>
30 30 <li class="disabled"><a id="8" href="#" title="Nervous" onclick="showSelectedSystemPins(event)">Nervous</a></li>
31 31 <li class="disabled"><a id="9" href="#" title="Reproductive" onclick="showSelectedSystemPins(event)">Reproductive</a></li>
32 32 <li class="disabled"><a id="10" href="#" title="Respiratory" onclick="showSelectedSystemPins(event)">Respiratory</a></li>
33   - <li><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li>
  33 + <li class="disabled"><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li>
34 34 <li class="disabled"><a id="12" href="#" title="Urinary" onclick="showSelectedSystemPins(event)">Urinary</a></li>
35 35 </ul>
36 36  
... ... @@ -72,7 +72,7 @@
72 72 </ul>
73 73 </div>
74 74 <div class="btn-group">
75   - <button type="button" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="navigatorMan" ng-click="alert('hi nav')">
  75 + <button type="button" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="navigatorMan">
76 76 <i class="fa fa-male"></i>
77 77 </button>
78 78 <ul class="dropdown-menu" style="min-width:auto;">
... ...