merged AIAHTML_BUG_UP manually

Nikita Kulshreshtha
2 parents c9d05f34 8005c883
Showing 7 changed files with 61 additions and 41 deletions
400-SOURCECODE/AIAHTML5.Web/Web.config
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html
400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
400-SOURCECODE/AIAHTML5.Web/index.aspx
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
@@ -20,7 +20,8 @@
   <location path="app/views">
 </location>
-  <system.webServer>
+  <system.webServer>.
+  
   <rewrite>
       <rules>
         <rule name="AngularJS Routes" stopProcessing="true">
@@ -42,6 +43,7 @@
       <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
       <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
       <mimeMap fileExtension=".vtt" mimeType="text/vtt" />
+            <mimeMap fileExtension=".json" mimeType="application/json" />
       <!--<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />-->
-AIA.controller("AIController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "DataService",
-function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, DataService) {
+AIA.controller("AIController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "DataService","AIAConstants",
+function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, DataService, AIAConstants) {
     // $rootScope.currentActiveModuleTitle = pages[3].name;
     $scope.showTabButton = true;
     $scope.IllustrationData;
@@ -222,6 +222,18 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     }
     $scope.ApplySearch = function (SearchText) {
+        var currentSearchtext = $rootScope.getLocalStorageValue("AIImageId");
+        localStorage.setItem("AIImageId", '');
+        if (currentSearchtext == "undefined" || (currentSearchtext == null || currentSearchtext == ""))
+        {
+        if (SearchText == "undefined" || (SearchText == null || SearchText == ""))
+        {
+            $rootScope.errorMessage = AIAConstants.PLEASE_ENTER_SEARCH_TEXT;
+            $("#messageModal").modal('show');
+           // alert("Please enter the text !")
+            return false;
+        }
+        }
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
@@ -279,7 +291,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           if (selectimg === true) {
                               $scope.imagePath = "~/../content/images/ai/thumbnails/" + value._ThumbnailImage;
-                              var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="AdamDetail($event)">'
+                              var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="OpenAdamImage($event)">'
                                     + '<div style="width:auto;height:auto;" class="thumbnail" >'
                                                + '<img style="height:150px" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
                                                + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
@@ -328,9 +340,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $scope.ApplySearchByAlphabet = function (SearchText) {
-
             $rootScope.isLoading = true;
+            $('ul li a').removeAttr("style");
             $('#spinner').css('visibility', 'visible');
+            $('#' + SearchText).css({"color": "white", "background-color" : "#1B92D0"});
             $scope.filterstring = true;
@@ -341,6 +354,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
+
             if (typeof (SearchText) !== "undefined" && (SearchText !== null && SearchText !== "")) {
                 localStorage.setItem("AIImageId", SearchText);
@@ -386,7 +400,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               if (selectimg === true) {
                                   $scope.imagePath = "~/../content/images/ai/thumbnails/" + value._ThumbnailImage;
-                                  var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="AdamDetail($event)">'
+                                  var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="OpenAdamImage($event)">'
                                         + '<div style="width:auto;height:auto;" class="thumbnail" >'
                                                    + '<img style="height:150px" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
                                                    + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
@@ -479,7 +493,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         var counter = 1;
         var tittle = $rootScope.getLocalStorageValue("currentImageTitleFromJson");
-        localStorage.setItem("currentImageTitle", tittle);
+        localStorage.setItem("currentViewTitle", tittle);
         var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
         promise.then(
@@ -509,7 +523,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               //ajax: {
                               //    url: 'app/views/ci/ci-view-detail.html'
                               //},
-                              title: $rootScope.getLocalStorageValue("currentImageTitle"),
+                              title: $rootScope.getLocalStorageValue("currentViewTitle"),
                               position: {
                                   top: 70,
                                   left: 20,
@@ -535,7 +549,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                          });
-                          $("#aiImagePanel .img-thumbnail").css("height", $("#aiImagePanel .jsPanel-content").height());
+                          //$("#aiImagePanel .img-thumbnail").css("height", $("#aiImagePanel .jsPanel-content").height());
+                          $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
                           var jspContentHeight = $('.jsPanel-content').height();
                       }
@@ -1324,6 +1324,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
             if ($('#ciImagePanel').length > 0)
                 $('#ciImagePanel').remove();
+            if ($('#aiImagePanel').length > 0)
+                $('#aiImagePanel').remove();
+
             if ($('#caVideoPanel').length > 0)
                 $('#caVideoPanel').remove();
@@ -5507,6 +5510,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
     function OpenJSPanel() {
         $("#daImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
         $("#ciImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
+        $("#aiImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
         $("#ImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
         $.jsPanel({
             id: 'jsPanel-1',
@@ -5647,6 +5651,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
     $(document).on('click', '#jsPanel-1 .jsglyph-remove', function () {
         $("#daImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
         $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
+        $("#aiImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
         $("#ImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
         $("#annotationButton").parent().removeClass("disableMenuannotation");
         $("#annotationToolBarOptions").removeClass("disableMenuoption");
 <div>
     <div ng-include="aap/widget/MainMenu.html"></div>
-    <div ng-init="OpenAdamImageView()" id="AIView" class="aiView" ng-controller="AIController" style=" "></div> <!--position: absolute !important;-->
-    
-    
+    <div ng-init="OpenAdamImageView()" id="AIView" class="aiView" ng-controller="AIController" style=" "></div> <!--position: absolute !important;--> 
 </div>
@@ -16,32 +16,32 @@
                         </form>
                         <nav>
                             <ul class="pagination pagination-sm no-margin">
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('A')">A</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('B')">B</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('C')">C</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('D')">D</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('E')">E</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('F')">F</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('G')">G</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('H')">H</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('I')">I</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('J')">J</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('K')">K</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('L')">L</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('M')">M</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('N')">N</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('O')">O</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('P')">P</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('Q')">Q</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('R')">R</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('S')">S</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('T')">T</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('U')">U</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('V')">V</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('W')">W</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('X')">X</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('Y')">Y</a></li>
-                                <li><a href="#" ng-click="ApplySearchByAlphabet('Z')">Z</a></li>
+                                <li><a id="A" href="#" ng-click="ApplySearchByAlphabet('A')">A</a></li>
+                                <li><a id="B" href="#" ng-click="ApplySearchByAlphabet('B')">B</a></li>
+                                <li><a id="C" href="#" ng-click="ApplySearchByAlphabet('C')">C</a></li>
+                                <li><a id="D" href="#" ng-click="ApplySearchByAlphabet('D')">D</a></li>
+                                <li><a id="E" href="#" ng-click="ApplySearchByAlphabet('E')">E</a></li>
+                                <li><a id="F" href="#" ng-click="ApplySearchByAlphabet('F')">F</a></li>
+                                <li><a id="G" href="#" ng-click="ApplySearchByAlphabet('G')">G</a></li>
+                                <li><a id="H" href="#" ng-click="ApplySearchByAlphabet('H')">H</a></li>
+                                <li><a id="I" href="#" ng-click="ApplySearchByAlphabet('I')">I</a></li>
+                                <li><a id="J" href="#" ng-click="ApplySearchByAlphabet('J')">J</a></li>
+                                <li><a id="K" href="#" ng-click="ApplySearchByAlphabet('K')">K</a></li>
+                                <li><a id="L" href="#" ng-click="ApplySearchByAlphabet('L')">L</a></li>
+                                <li><a id="M" href="#" ng-click="ApplySearchByAlphabet('M')">M</a></li>
+                                <li><a id="N" href="#" ng-click="ApplySearchByAlphabet('N')">N</a></li>
+                                <li><a id="O" href="#" ng-click="ApplySearchByAlphabet('O')">O</a></li>
+                                <li><a id="P" href="#" ng-click="ApplySearchByAlphabet('P')">P</a></li>
+                                <li><a id="Q" href="#" ng-click="ApplySearchByAlphabet('Q')">Q</a></li>
+                                <li><a id="R" href="#" ng-click="ApplySearchByAlphabet('R')">R</a></li>
+                                <li><a id="S" href="#" ng-click="ApplySearchByAlphabet('S')">S</a></li>
+                                <li><a id="T" href="#" ng-click="ApplySearchByAlphabet('T')">T</a></li>
+                                <li><a id="U" href="#" ng-click="ApplySearchByAlphabet('U')">U</a></li>
+                                <li><a id="V" href="#" ng-click="ApplySearchByAlphabet('V')">V</a></li>
+                                <li><a id="W" href="#" ng-click="ApplySearchByAlphabet('W')">W</a></li>
+                                <li><a id="X" href="#" ng-click="ApplySearchByAlphabet('X')">X</a></li>
+                                <li><a id="Y" href="#" ng-click="ApplySearchByAlphabet('Y')">Y</a></li>
+                                <li><a id="Z" href="#" ng-click="ApplySearchByAlphabet('Z')">Z</a></li>
                             </ul>
                             <button type="button" class="btn btn-primary btn-sm" ng-click="Reset(query)" style = "margin-bottom:23px"><i class="fa fa-eye"></i>Show All</button>
                         </nav>
@@ -164,8 +164,8 @@
     </style>
     <script>
-        var params = "<%=urlParams%>"; 
-       var isCalsCredantialForSIte ="<%=isCalsCredantial%>";
+        var params = "<%=urlParams%>";
+        var isCalsCredantialForSIte = "<%=isCalsCredantial%>";
     </script>
 </head>
@@ -310,7 +310,7 @@ h3.jsPanel-title{
 .jsPanel-hdr.jsPanel-theme-success{ color: #fff; font-family: Open Sans, Helvetica,tahoma,arial,verdana,sans-serif; font-weight: bold; font-size:15px; background: #818D43; height:20px;}
 .jsPanel-hdr.jsPanel-theme-success h3{ color: #fff;font-size:20px;font-weight: bold }
 .jsPanel-hdr.jsPanel-theme-success h3 small{ color: #fff; font-size: 65%; font-weight: bold}
-.jsPanel-content.jsPanel-theme-success { background: none repeat scroll 0 0 #ffffff; color: #000000; font-family: tahoma,arial,verdana,sans-serif; outline: 1px solid #bbb;background-color:#222222 }
+.jsPanel-content.jsPanel-theme-success { background: none repeat scroll 0 0 #ffffff; color: #000000; font-family: tahoma,arial,verdana,sans-serif; outline: 1px solid #bbb;background-color:#222222; }
 .jsPanel-ftr.jsPanel-theme-success{}
 .jsPanel-theme-successt .ui-icon-gripsmall-diagonal-se{ color: #000; }