Merge branch 'DisablePendingModules' into Develop

Amrita Vishnoi
2 parents 9ed1a0c0 c9c94e8a
Showing 5 changed files with 24 additions and 12 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -3824,11 +3824,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             }, 1000);
         }
         $("#optionsListManagerTab").addClass("active");
-        var viewNameAftrSplit = $("#viewName").val().split(" ");
-        if (viewNameAftrSplit[0] == "null") {
-            document.location.href = "/";
+        var viewNameAftrSplit;
+        if ($("#viewName").val() !== null) {
+            viewNameAftrSplit = $("#viewName").val().split(" ");
+        
+            if (viewNameAftrSplit[0] == "null") {
+                document.location.href = "/";
+            }
         }
-
         if ($location.url() == "/module-item-view") {
             $("#termList").attr("onclick", "if (typeof(this.selectedIndex) != 'undefined') onSearchItemSelection(this.options[this.selectedIndex].id)");
         }
@@ -143,7 +143,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
  
  
     $scope.openListViewModuleItem = function (event) {
-
         $("#demoView").remove();
         var moduleItemDataToBeSavedID = event.currentTarget.id;
         $("#list-view table tbody tr").removeClass("active");
@@ -153,7 +152,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text().trim();
         $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData);
         $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3];
-        $rootScope.listArray = [];
+        //$rootScope.listArray = [];
         $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved });
         $("#viewList").append("<div class='col-xs-12 text-center' style='padding-top:15px;padding-bottom:15px;' id='demoView'><div class='col-xs-12' style='padding:15px;background-color:#fff;'><div class='col-xs-2' style='border:1px solid #000;padding:5px;color:#000;font-size:12px;'><div class='thumbnail' style='margin-bottom:10px;'><img style='width:auto;height:95px!important;' src=" + $rootScope.OpenItemImagePath + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + moduleItemDataToBeSaved + "</div></div></div><a style='position:absolute;right:30px;bottom:34px;' onclick='openCurrentView(event)' href='javascript:void(0)' class='pull-right btn btn-primary'>Open</a></div>");
     }
@@ -1245,7 +1244,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     $scope.$on('listManagerEvent', function (event, data) {
  
         $("#viewName").empty();
-        $("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>");
+
+        var currentView = $rootScope.getLocalStorageValue("currentViewTitle");
+        var viewNmeHtml = '<option>' + currentView + '</option>'
+        $('#viewName').append(viewNmeHtml);
+        //$("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>");
         $rootScope.isLoading = false;
         $('#spinner').css('visibility', 'hidden');
  
@@ -1802,7 +1805,6 @@ function openListViewModuleItem(event) {
 }
  
 function openCurrentView(event) {
-
     var scope = angular.element(document.getElementById("list-view")).scope();
     scope.isListViewButtonClicked = true;
     scope.isOpenBtnClicked = true;
-<div class="bodyWrap row ">
+<div class="bodyWrap row ">
     <div ng-include="'app/widget/MainMenu.html'" />
     <div class="main" ng-init="loadForModuleById(1)">
         <!--<div class="main">-->
@@ -86,7 +86,7 @@
                 <!--<div role="tabpanel" class="tab-pane active" id="grid-view">-->
                 <div role="tabpanel" class="tab-pane active" id="grid-view">
                     <div ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title' ">
-                        <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" data-ng-click="openModuleItemView($event)">
+                        <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" ng-click="openModuleItemView($event)">
                             <div class="thumbnail">
                                 <a href="#">
                                     <img class="tinyImg" id="{{val._Title}}" ng-src="../content/images/aa/thumbnails/{{val._TileImageName}}" data-ng-click="openModuleItemView($event)" alt="" title="">
@@ -26,7 +26,7 @@
     <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
         <!--{{name}}-->
         <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
-            <li ng-repeat="module in userModules"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')"><!--{{module.name}}--></a></li>
+            <li ng-repeat="module in userModules" ng-disabled="module.id==7|| module.id==8 || module.id==10"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-disabled="module.id==7|| module.id==8 || module.id==10"><!--{{module.name}}--></a></li>
         </ul>
     </div>
  
@@ -1093,4 +1093,11 @@ color:#ffffff !important;
  
   width : 400px !important;
  
- }
 \ No newline at end of file
+ }
+
+li[disabled], a[disabled] {
+    pointer-events: none;
+}
+a[disabled] {
+    color: #aaa !important; 
+}
 \ No newline at end of file