Some AA bug fixes-

Amrita Vishnoi
1 parent 675ce92b
Showing 6 changed files with 64 additions and 63 deletions
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
@@ -569,7 +569,6 @@
     <Content Include="content\data\json\aa\aa_pindata\aa_dat_pindata_3332.json" />
     <Content Include="content\data\json\aa\aa_pindata\aa_dat_pindata_3333.json" />
     <Content Include="content\data\json\aa\aa_pindata\aa_dat_pindata_3334.json" />
-    <Content Include="content\data\json\aa\aa_dat_term.json" />
     <None Include="content\data\json\da\body-views\10\da_dat_tm_sg_10.json" />
     <Content Include="content\data\json\da\body-views\12\da_dat_layer_12.json" />
     <Content Include="content\data\json\da\body-views\12\da_dat_tm_sg_12.json" />
@@ -593,16 +592,15 @@
     <None Include="content\data\json\da\body-views\8\da_dat_tm_sg_8.json" />
     <Content Include="content\data\json\da\body-views\9\da_dat_body_system_term_9.json" />
     <None Include="content\data\json\da\body-views\9\da_dat_tm_sg_9.json" />
-    <Content Include="content\data\json\da\vocab\English_Undergraduate\cm_dat_vocabterm_2.json" />
-    <Content Include="content\data\json\da\vocab\English\cm_dat_vocabterm_1.json" />
+    <Content Include="content\data\json\da\vocab\English %28Undergraduate%29\cm_dat_vocabterm_2.json" />
     <None Include="content\data\json\da\vocab\German\cm_dat_vocabterm_4.json" />
     <None Include="content\data\json\da\vocab\Spanish\cm_dat_vocabterm_5.json" />
     <None Include="content\data\json\da\vocab\Hungarian\cm_dat_vocabterm_6.json" />
     <None Include="content\data\json\da\vocab\Italian\cm_dat_vocabterm_7.json" />
     <None Include="content\data\json\da\vocab\French\cm_dat_vocabterm_8.json" />
     <None Include="content\data\json\da\vocab\Portuguese\cm_dat_vocabterm_9.json" />
-    <None Include="content\data\json\da\vocab\Japanese_Kanji\cm_dat_vocabterm_10.json" />
-    <None Include="content\data\json\da\vocab\Japanese_yomi\cm_dat_vocabterm_11.json" />
+    <None Include="content\data\json\da\vocab\Japanese %28Kanji%29\cm_dat_vocabterm_10.json" />
+    <None Include="content\data\json\da\vocab\japanese %28yomi%29\cm_dat_vocabterm_11.json" />
     <Content Include="content\images\1.jpg" />
     <Content Include="content\images\1000x600.jpg" />
     <Content Include="content\images\3da\thumbnails\3d_tni_3347.jpg" />
@@ -44717,6 +44715,7 @@
     <Content Include="themes\default\css\bootstrap\fonts\glyphicons-halflings-regular.woff" />
     <Content Include="themes\default\css\bootstrap\fonts\glyphicons-halflings-regular.woff2" />
     <Content Include="content\images\Thumbs.db" />
+    <Content Include="content\data\json\da\vocab\english\cm_dat_vocabterm_1.json" />
     <Content Include="content\data\json\da\da_dat_brview.json" />
     <Content Include="content\data\json\da\da_dat_contentlist.json" />
     <Content Include="libs\jquery\jquery_plugin\jsPanel\jspanel\fonts\jsglyph.eot" />
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ProjectFiles</ProjectView>
@@ -100,71 +100,73 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
-        $.jsPanel({
-            id: 'ImagePanel',
-            selector: '.aaBodyView',
-            theme: 'success',
-            currentController: 'TileViewListController',
-            parentSlug: 'tile-view',
-            ajax: {
-                url: jsContentURL
-            },
-            title: localStorage.getItem("currentViewTitle"),
+        //1. create a jsPanel and load the module item view
+        if ($rootScope.moduleName == ATLAS_ANATOMY) {
+            $.jsPanel({
+                id: 'ImagePanel',
+                selector: '.aaBodyView',
+                theme: 'success',
+                currentController: 'TileViewListController',
+                parentSlug: 'tile-view-list',
+                ajax: {
+                    url: jsContentURL
+                },
+                title: localStorage.getItem("currentViewTitle"),
-            position: {
-                top: 70,
-                left: 1,
-            },
+                position: {
+                    top: 70,
+                    left: 1,
+                },
-            size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
+                size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
-        });
+            });
-        console.log('jsPanel loaded ImagePanel exist= ' + document.getElementById('ImagePanel'))
+            console.log('jsPanel loaded ImagePanel exist= ' + document.getElementById('ImagePanel'))
-        //0.3
-        var aaViewElement = angular.element(document.getElementById(moduleItemViewDivId));
+            //0.3
+            var aaViewElement = angular.element(document.getElementById(moduleItemViewDivId));
-        //0.4 for Opening module item, load it into image
-        var openedImage = new Image();
-        openedImage.name = $rootScope.OpenItemImagePath;
-        openedImage.onload = getImageHeightWidth;
-        openedImage.onerror = loadFailure;
-        openedImage.src = $rootScope.OpenItemImagePath;
+            //0.4 for Opening module item, load it into image
+            var openedImage = new Image();
+            openedImage.name = $rootScope.OpenItemImagePath;
+            openedImage.onload = getImageHeightWidth;
+            openedImage.onerror = loadFailure;
+            openedImage.src = $rootScope.OpenItemImagePath;
-        $timeout(function () {
-            $compile(aaViewElement.contents())($scope);
+            $timeout(function () {
+                $compile(aaViewElement.contents())($scope);
-            if (document.getElementById('aaDetailPageDiv') != null) {
+                if (document.getElementById('aaDetailPageDiv') != null) {
-                //0.4 added some stylesheets
-                $('#aaBodyView').css("height", $(window).outerHeight());
-                $('#aaBodyView').css("width", $(window).outerWidth());
+                    //0.4 added some stylesheets
+                    $('#aaBodyView').css("height", $(window).outerHeight());
+                    $('#aaBodyView').css("width", $(window).outerWidth());
-                $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
-                $("#modItemImage").attr('src', $rootScope.OpenItemImagePath);
+                    $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
+                    $("#modItemImage").attr('src', $rootScope.OpenItemImagePath);
-                //0.5 create canvas on the top of image so that I can draw a line over the canvas.
-                var canvas = document.createElement('canvas');
-                canvas.id = 'aaDetailViewCanvas';
-                canvas.height = parseInt(($scope.imageHeight));
-                canvas.width = parseInt($scope.imageWidth);
-                canvas.style.left = '0px';
-                canvas.style.top = '0px';
-                canvas.style.position = "absolute";
+                    //0.5 create canvas on the top of image so that I can draw a line over the canvas.
+                    var canvas = document.createElement('canvas');
+                    canvas.id = 'aaDetailViewCanvas';
+                    canvas.height = parseInt(($scope.imageHeight));
+                    canvas.width = parseInt($scope.imageWidth);
+                    canvas.style.left = '0px';
+                    canvas.style.top = '0px';
+                    canvas.style.position = "absolute";
-                $("#imageDiv").append(canvas);
-                $scope.context = canvas.getContext("2d")
+                    $("#imageDiv").append(canvas);
+                    $scope.context = canvas.getContext("2d")
-                //6. Show all pins on AA opened item
-                $scope.showAllPins();
-                //7. Highlight all system body list in left side
-                $scope.highlightBodySystemList();
-            }
-        }, 1050);
+                    //6. Show all pins on AA opened item
+                    $scope.showAllPins();
+                    //7. Highlight all system body list in left side
+                    $scope.highlightBodySystemList();
+                }
+            }, 1050);
+        }
     }
-
     $scope.highlightBodySystemList = function () {
         $rootScope.bodySystemNames = $rootScope.bodySystemName.trim().split(/\s*,\s*/);
         var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
@@ -173,7 +175,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //var boldTag = lis[i];
             for (var j = 0; j < $rootScope.bodySystemNames.length; j++) {
                 if ((bodySystemListObj[i].innerHTML) == ($rootScope.bodySystemNames[j])) {
-                    $("#" + i).removeClass("disabled");
+                    $("#" + i).parent().removeClass("disabled");
                 }
             }
@@ -20,17 +20,17 @@
                 <ul class="dropdown-menu" aria-labelledby="dropdownMenu221" id="bodySystemList">
                     <li><a href="#" title="Current Structure">All</a></li>
                     <li role="separator" class="divider"></li>
-                    <li><a id="1" href="#" title="Cardiovascular"  onclick="showSelectedSystemPins(event)">Cardiovascular</a></li>
-                    <li><a id="2" href="#" title="Digestive" onclick="showSelectedSystemPins(event)">Digestive</a></li>
+                    <li class="disabled"><a id="1" href="#" title="Cardiovascular" onclick="showSelectedSystemPins(event)">Cardiovascular</a></li>
+                    <li class="disabled"><a id="2" href="#" title="Digestive" onclick="showSelectedSystemPins(event)">Digestive</a></li>
                     <li class="disabled"><a id="3" href="#" title="Endocrine" onclick="showSelectedSystemPins(event)">Endocrine</a></li>
-                    <li ><a id="4" href="#" title="Immune" onclick="showSelectedSystemPins(event)">Immune</a></li>
+                    <li class="disabled"><a id="4" href="#" title="Immune" onclick="showSelectedSystemPins(event)">Immune</a></li>
                     <li class="disabled"><a id="5" href="#" title="Integumentary" onclick="showSelectedSystemPins(event)">Integumentary</a></li>
                     <li class="disabled"><a id="6" href="#" title="Lymphatic" onclick="showSelectedSystemPins(event)">Lymphatic</a></li>
-                    <li><a id="7" href="#" title="Muscular" onclick="showSelectedSystemPins(event)">Muscular</a></li>
+                    <li class="disabled"><a id="7" href="#" title="Muscular" onclick="showSelectedSystemPins(event)">Muscular</a></li>
                     <li class="disabled"><a id="8" href="#" title="Nervous" onclick="showSelectedSystemPins(event)">Nervous</a></li>
                     <li class="disabled"><a id="9" href="#" title="Reproductive" onclick="showSelectedSystemPins(event)">Reproductive</a></li>
                     <li class="disabled"><a id="10" href="#" title="Respiratory" onclick="showSelectedSystemPins(event)">Respiratory</a></li>
-                    <li><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li>
+                    <li class="disabled"><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li>
                     <li class="disabled"><a id="12" href="#" title="Urinary" onclick="showSelectedSystemPins(event)">Urinary</a></li>
                 </ul>
@@ -72,7 +72,7 @@
                         </ul>
                     </div>
                     <div class="btn-group">
-                        <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')">
+                        <button type="button" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="navigatorMan">
                             <i class="fa fa-male"></i>
                         </button>
                         <ul class="dropdown-menu" style="min-width:auto;">