update new change from develop

Birendra Kumar
2 parents bf6f923e 01293e7f
Showing 6 changed files with 76 additions and 196 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
@@ -21,85 +21,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     localStorage.setItem("ImageCount", Count);
     var searchByText = $rootScope.getLocalStorageValue("SearchText");
     var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet");
-    var SelectCurrTab = $rootScope.getLocalStorageValue("currentAITabView");
-
-    //Commented by sandeep for fixed bugs related to ADAM Images
-    //$timeout(function () {
-    //    $("#ListViewDiv").on('scroll', function () {
-            
-    //        var searchByText = $rootScope.getLocalStorageValue("SearchText");
-    //        var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet");
-    //        var SelectCurrTab = $rootScope.getLocalStorageValue("currentAITabView");
-    //        if ($scope.query.SelectedDiv == 2) {
-
-    //            if ($(this).scrollTop() + $(this).innerHeight() >= $(this)[0].scrollHeight - 10) {
-    //                Count += 100;
-    //                //$(window).scrollTop(0);
-    //                var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
-    //                if (typeof (searchByText) !== "undefined" && searchByText !== null && searchByText !== '') {
-    //                    $scope.query.SearchText = searchByText;
-    //                }
-    //                else if (typeof (searchTextByAlphabet) !== "undefined" && searchTextByAlphabet !== null && searchTextByAlphabet !== '') {
-    //                    $scope.query.SearchTextByAlphabet = searchTextByAlphabet;
-    //                }
-    //                else {
-    //                    $scope.query.SearchTextByAlphabet = "";
-    //                }
-
-    //                if ($scope.query.SearchText == "" && $scope.query.SearchTextByAlphabet == "") {
-
-    //                    $scope.LoadAIJsonData(Count);
-    //                    $scope.loadAllAI(Count);
-    //                }
-    //                else if ($scope.query.SearchTextByAlphabet != "" || $scope.query.SearchText == "") {
-    //                    $scope.ApplySearchByAlphabet($scope.query.SearchTextByAlphabet);
-    //                }
-    //                else {
-    //                    $scope.ApplySearch($scope.query);
-    //                }
-    //            }
-    //        }
-    //    });
-
-    //}, 10);
-
-    //$(window).scroll(function () {
-    //    var searchByText = $rootScope.getLocalStorageValue("SearchText");
-    //    var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet");
-    //    var SelectCurrTab = $rootScope.getLocalStorageValue("currentAITabView");
-    //    if ($scope.query.SelectedDiv == 1) {
-           
-    //        if ($(window).scrollTop() == $(document).height() - $(window).height()) {
-    //            Count += 100;
-    //            var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
-    //            if (typeof (searchByText) !== "undefined" && searchByText !== null && searchByText !== '') {
-    //                $scope.query.SearchText = searchByText;
-    //            }
-    //            else if (typeof (searchTextByAlphabet) !== "undefined" && searchTextByAlphabet !== null && searchTextByAlphabet !== '') {
-    //                $scope.query.SearchTextByAlphabet = searchTextByAlphabet;
-    //            }
-    //            else {
-    //                $scope.query.SearchTextByAlphabet = "";
-    //            }
-
-    //            if ($scope.query.SearchText == "" && $scope.query.SearchTextByAlphabet == "") {
-
-    //                $scope.LoadAIJsonData(Count);
-    //                $scope.loadAllAI(Count);
-    //            }
-    //            else if ($scope.query.SearchTextByAlphabet != "" || $scope.query.SearchText == "") {
-    //                $scope.ApplySearchByAlphabet($scope.query.SearchTextByAlphabet);
-    //            }
-    //            else {
-    //                $scope.ApplySearch($scope.query);
-    //            }
-    //        }
-    //    }
-    //});
+    var SelectCurrTab = $rootScope.getLocalStorageValue("currentAITabView");   
-    
+    //Modified code by sandeep for fixed Bugs of ADAM Images 
     $scope.setActiveTab = function (tabToSet, inderectCall) {
-        //Modified code by sandeep for fixed Bugs of ADAM Images 
+        
         $scope.activeTab = tabToSet;
         localStorage.setItem("currentAITabView", "");
         localStorage.setItem("currentAITabView", $scope.activeTab);
@@ -139,14 +65,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                         $scope.filterstring = false;
                         $scope.showItem(selectedImageId);
                         $scope.filterstring = true;
-                    }
-                    //$scope.ReloadListViewImageDiv(curSelectedRowId, ImageCount);
+                    }                    
                 }
             }
-            else {
-                //ReloadListViewImageDiv(curSelectedRowId, ImageCount);
-                $scope.loadAllAI(ImageCount);
-                if (inderectCall == true) {
+            else {                
+                  $scope.loadAllAI(ImageCount);
+                  if (inderectCall == true) {
                     if (curSelectedRowId != "") {
                         $scope.filterstring = true;
                         $scope.showItem(curSelectedRowId);
@@ -156,13 +80,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     if (selectedImageId != "") {
                         $scope.filterstring = false;
                         $scope.showItem(selectedImageId);
-                    }
-                    //$scope.ReloadListViewImageDiv(curSelectedRowId, ImageCount);
+                    }                    
                 }
             }            
             $scope.query.SelectedDiv = tabToSet;
-            //Method call for set position for selected title Bug-57978
-            //$scope.ReloadListViewImageDiv(curSelectedRowId, ImageCount);
+            //Method call for set position for selected title Bug-57978            
             $('#grid-view').css("display", "none");
             $('#list-view').css("display", "block");
         }
@@ -191,60 +113,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             }, 100);
     };
-
-
-    //$scope.loadAIModuleById = function (moduleId) {      
-        
-    //    var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
-
-    //    if ($rootScope.refreshcheck == null) {
-    //        $location.path('/');
-    //    }
-
-    //    // code that will be executed ... 
-    //    // every time this view is loaded
-
-    //    //get current path
-    //    var currentURL = $location.path();
-    //    var selectedModuleName = '';
-    //    //set module title
-    //    angular.forEach($rootScope.userModules, function (value, key) {
-    //        if (value.slug === currentURL.replace('/', '')) {
-    //            selectedModuleName = value.name;
-    //        }
-    //        $rootScope.currentActiveModuleTitle = selectedModuleName;
-    //    })
-
-    //    $scope.LoadAIJsonData(ImageCount);
-    //    $scope.scroll();
-    //    //push the details of open module in array   $rootScope.openModules
-    //    $rootScope.openModules.push({ "ModuleId": 13 });
-
-    //    //set the local storage
-    //    var curtab = $rootScope.getLocalStorageValue("currentAITabView");        
-    //    var inderectCall = true;
-    //    if (curtab == 2) {
-    //        $scope.setActiveTab(2, inderectCall);
-    //        var curSelectedRowId = $rootScope.getLocalStorageValue("AISelectedRowId");
-    //        if (typeof (curSelectedRowId) !== "undefined" && curSelectedRowId !== null && curSelectedRowId !== '') {
-    //            $scope.reRunSearchOnLoad();
-    //            $scope.idSelected = curSelectedRowId;
-    //            $scope.ReloadListViewImageDiv($scope.idSelected, ImageCount);
-    //        }
-    //        else {
-    //            $scope.reRunSearchOnLoad()
-    //            $scope.idSelected = '';
-    //        }
-    //    }
-    //    else {
-    //        $scope.setActiveTab(1, inderectCall);
-    //        $scope.reRunSearchOnLoad();
-
-    //    }
-    //}
-
+    
     $scope.loadAIModuleById = function (moduleId) {
-
+        
+        if ($rootScope.checkRefreshButtonClick == 1) {
+            var query = $scope.query;
+            $scope.Reset(query);
+            $rootScope.checkRefreshButtonClick = 0;
+        }
         var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
         if ($rootScope.refreshcheck == null) {
@@ -309,10 +185,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             $scope.query.SearchTextByAlphabet = "";
         }
-        if ($scope.query.SearchText == "" && $scope.query.SearchTextByAlphabet == "") {
+        //if ($scope.query.SearchText == "" && $scope.query.SearchTextByAlphabet == "") {
-            $scope.loadAllAI(ImageCount);
-        } 
+        //    $scope.loadAllAI(ImageCount);
+        //} 
     }
@@ -353,12 +229,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       $scope.selectedAIListViewData = new jinqJs()
                                                       .from($scope.IllustrationData.root.AIData)
                                                       .orderBy([{ field: '_Title', sort: 'asc' }])
-                                                      .select().slice(0, ImageCount);
+                                                      //.select().slice(0, ImageCount);
+                                                     .select();  //Fixed Bug-58419 by Sandeep
                       //console.log($scope.selectedAIListViewData);
-
-
                       $('#grid-view').empty();
                       var $e1 = $('<ul><li ng-repeat="value in selectedAIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}"  title = "{{value._Title}}"  class="GridViewDataDivHeight" data-ng-click="OpenAdamImage($event)">'
                               + '<div class="thumbnail" >'
@@ -382,7 +257,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           }, 10);
                       }
-
                   },
                   function (error) {
                       // handle errors here
@@ -440,14 +314,27 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         }
     };
+    //Code changes by Sandeep for fixed bug-57854
     $scope.Reset = function (query) {
         $('ul li span').removeAttr("style");
         query.SearchText = "";
         $scope.idSelected = '';
+        $scope.hideListViewDiv();
         //set localstorage values
         localStorage.setItem("SearchText", '');
         localStorage.setItem("SearchByAlphabet", '');
         localStorage.setItem("AIListViewScroll", '');
+        localStorage.setItem("AIGridViewScroll", '');
+        localStorage.setItem("currentAITabView", '');
+        localStorage.setItem("AIListViewScrollPosition", '');
+        localStorage.setItem("AISelectedRowId", '');
+        localStorage.setItem("currentAIImageId", '');        
+        localStorage.setItem("listViewSelectedID", '');
+        localStorage.setItem("AIGridViewHighlightThumbnail", '');
+        localStorage.setItem("currentViewTitle", '');
+        localStorage.setItem("currentImageTitleFromJson", '');        
+        //localStorage.setItem("", '');
+        //localStorage.setItem("", '');
         var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
         if ($('.selected').hasClass("selected")) {
             $('.selected').removeClass("selected");
@@ -455,13 +342,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $('#ListViewDiv').scrollTop(0);
-        $scope.hideListViewDiv();
+        //$scope.hideListViewDiv();
         $scope.filterstring = false;
         while ($scope.searchAIListViewData.length) {
             $scope.searchAIListViewData.pop();
         }
-        $scope.loadAllAI(ImageCount);
+        //$scope.loadAllAI(ImageCount);
     }
     $scope.ApplySearch = function (query) {
@@ -612,6 +499,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             if (AIListViewScroll !== null  && $location.url() == "/ADAM-images" && AIListViewScroll != "0") {
                 $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue('AIListViewScrollPosition') }, 'slow');
             }
+            //if (_currentImgId != "null" && _currentImgId != null) {
+            //    $('html, body').animate({ scrollTop: _currentImgId }, 'slow');
+            //}
             else if (aISelectedRowId != "null" && aISelectedRowId != null) {
                 $('html, body').animate({ scrollTop: $('#' + aISelectedRowId).position().top }, 100);
             }            
@@ -827,30 +717,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               size: { width: $(window).outerWidth() - 30, height: $(window).outerHeight() - 125 },
                           });
-
-                          //$('#canvasDiv img').load(function () {
-
-                          //    $rootScope.isLoading = false;
-                          //    $('#aiSpinner').css('visibility', 'hidden');
-                          //    var canvas = document.getElementById("canvas");
-                          //    var canvasPaint = document.getElementById("canvasPaint");
-
-                          //    var imageheight = $("#aimage").height();
-                          //    var canvasDivheight = $(window).outerHeight() - 150;
-
-                          //    if (canvasDivheight > imageheight) {
-                          //        canvas.height = canvasDivheight;
-                          //        canvasPaint.height = canvasDivheight;
-                          //    }
-                          //    else {
-                          //        canvas.height = imageheight;
-                          //        canvasPaint.height = imageheight;
-                          //    }
-
-                          //    canvas.width = $(window).outerWidth() - 81;
-                          //    canvasPaint.width = $(window).outerWidth() - 81;
-
-                          //});
+                          
                           $('#canvasDiv img').load(function () {
                              $rootScope.isLoading = false;
                              $('#aiSpinner').css('visibility', 'hidden');
@@ -932,7 +799,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       //Set the scroll position of the tablebody to show selected row
-                      $scope.setImgPosition();                     
+                      //$scope.setImgPosition();                     
                       $rootScope.isLoading = false;
                       $('#aiSpinner').css('visibility', 'hidden');
@@ -147,10 +147,8 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
         $("#messageModal").modal('show');
     }
-
-    $scope.helpTopicLink=function()
-    {
-        var dd = $("#helplinkId").html();
+    
+    $scope.helpTopicLink = function () {
         var absurl = $location.absUrl();
         var hTopicUrl = absurl + "content/help/index.html";
         var aboutADAM = absurl + "content/help/about/Adam_Credits_AIA5.html";
@@ -163,7 +161,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
     }
     $rootScope.initializeAIA = function () {
-         
+
+        $rootScope.checkRefreshButtonClick = 1;
+
         if (params != null && params != undefined && params != "") {
             $scope.ValidateClientSiteUrl();
@@ -220,11 +220,11 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
             $rootScope.getConfigurationValues();
         }
+
         $timeout(function () {
             $scope.helpTopicLink();
         }, 2000);
-
     }
@@ -1402,9 +1402,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
             $rootScope.PrintPreview = "PrintPreview";
             $rootScope.exportImage = "exportImage";
             $rootScope.PrintViewer = "PrintViewer";
-            $rootScope.newCurriculum = "newCurriculum";
-            $rootScope.openCurriculum = "openCurriculum";
-            $rootScope.saveCurriculam = "saveCurriculam";
+            $rootScope.newCurriculum = "";
+            $rootScope.openCurriculum = "";
+            $rootScope.saveCurriculam = "";
         }
         else if ($location.url() == "/adam-images-detail") {
@@ -129,6 +129,17 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
         $scope.LabExerciseName = keywords.labexercise;
         $scope.LabExerciseModules = null;
         $scope.LabExerciseBoxes = null;
+        
+        if ($scope.quiznumber == 1) {
+            $("#btnBackward").css('pointer-events', 'none');
+        }
+        else if ($scope.quiznumber == $scope.TotalNumberofQuiz) {
+            $("#btnForward").css('pointer-events', 'none');
+        }
+        else {
+            $("#btnBackward").css('pointer-events', 'auto');
+            $("#btnForward").css('pointer-events', 'auto');
+        }      
         //alert($scope.LabExerciseName)
         var labExerciseModulePath = '~/../content/data/json/le/' + $scope.LabExerciseName + '.json';
@@ -1384,12 +1395,12 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
         // email validation code
-        var senderEmails = $("#emailTo").val().split(", ");
+        var senderEmails = $("#emailTo").val().split(",");
         $scope.isSenderEmailValid = false;
         for (var i = 0; i <= senderEmails.length - 1; i++) {
-            var sEmail = senderEmails[i];
-            if ($.trim(sEmail).length == 0) {
+            var sEmail = $.trim(senderEmails[i]);
+            if (sEmail.length == 0) {
                 //alert('*Email To email address is empty');
                 $scope.isSenderEmailValid = false;
                 // event.preventDefault();
@@ -230,7 +230,9 @@
                                         <div class="col-sm-12" style=" margin-top: 20px; min-height:100px;" id="divoptions" droppable="true">
                                             <!--<div class="col-sm-3 col-lg-3  ui-draggable" >-->
-                                            <div draggable="true" ng-repeat="option in LabExerciseModules.Options" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'5px !important','float':'{{option.textalign}}'} " style="margin-bottom: 5px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3  ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
+                                            <!--<div draggable="true" ng-repeat="option in LabExerciseModules.Options" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'5px !important','float':'{{option.textalign}}'} " style="margin-bottom: 5px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3  ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>-->
+                                            <div draggable="true" ng-repeat="option in LabExerciseModules.Options"  style="margin-bottom: 5px !important; width: 180px; float: left"  class="thumbnail caption col-sm-2 col-lg-3  ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
+                                            
                                         </div>
                                     </div>
                                 </div>
@@ -252,8 +254,8 @@
                                         <button class="btn btn-sm btn-primary" id="resetBtn" ng-click="OnResetClick()">Reset</button>
                                     </div>
                                     <div class="btn-group">
-                                        <button class="btn btn-sm btn-black" ng-click="prevQuiz()"><i class="fa fa-arrow-left"></i></button>
-                                        <button class="btn btn-sm btn-black" ng-click="nextQuiz()"><i class="fa fa-arrow-right"></i></button>
+                                        <button id="btnBackward" class="btn btn-sm btn-black" ng-click="prevQuiz()"><i class="fa fa-arrow-left"></i></button>
+                                        <button id="btnForward" class="btn btn-sm btn-black" ng-click="nextQuiz()"><i class="fa fa-arrow-right"></i></button>
                                     </div>
                                 </div>
                                 <div class="clearfix"></div>
@@ -71,7 +71,7 @@
                             </tr>
                         </tbody>
                         <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody">
-                            <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="OpenAdamImage($event)" ng-repeat="item in searchAIListViewData">
+                            <tr id="{{item._id}}" ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="OpenAdamImage($event)" ng-repeat="item in searchAIListViewData">
                                 <td width="20%">
                                     {{item._Title}}
                                 </td>
@@ -84,7 +84,7 @@
                     <div class="row well">
                         <div title="{{SelectedAITitle}}" class="col-sm-3 col-lg-2 no-padding">
                             <div class="thumbnail no-margin">
-                                <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="OpenAdamImage($event)">
+                                <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="OpenAdamImage($event)">                                
                             </div>
                         </div>
                         <div class="col-sm-9 col-lg-9" style="padding-left:10px;">
@@ -44,13 +44,13 @@
         <li class="dropdown navbarDropdownItem">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a>
             <ul class="dropdown-menu" id="helplinkId">
-                <!--<li><a href="http://interactiveanatomy.com/content/help/index.html" target="_blank">Help Topics</a></li>-->
-                <!--<li><a href="http://adameducation.com/Contact" target="_blank">Customer Support</a></li>-->
-                <!--<li role="separator" class="divider"></li>-->
-               <!-- <li><a href="http://interactiveanatomy.com/content/help/about/Adam_Credits_AIA5.html" target="_blank">About A.D.A.M.</a></li>-->
+                <!--<li><a href="http://interactiveanatomy.com/content/help/index.html" target="_blank">Help Topics</a></li>
+                <li><a href="http://adameducation.com/Contact" target="_blank">Customer Support</a></li>
+                <li role="separator" class="divider"></li>
+                <li><a href="http://interactiveanatomy.com/content/help/about/Adam_Credits_AIA5.html" target="_blank">About A.D.A.M.</a></li>-->
             </ul>
         </li>
-        <!--redirecting to Admin-->
+        <!--redirecting to Admin
         <li class="navbarItem"><a ng-click="reDirectURLToAdmin()" ng-show="haveRoleAdmin" style="cursor: pointer;">Admin</a></li>
     </ul>
     <ul class="nav navbar-nav navbar-right">