diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index c4886c643..2e88a1839 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -32,6 +32,10 @@ padding-left: 0px; } +.marginright10 { + margin-right: 10px; +} + .cookbook-edit-text { background: #fff; } diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index e15089959..59624ca07 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -177,39 +177,63 @@ $scope.filterByBotType = false; $scope.filterByTaskType = false; $scope.filterByCategory = false; - //$scope.showAllBots(); } }; $rootScope.applyFilter = function() { lib.gridOptions=[]; + $scope.botSummary=[]; if ($scope.botLibFilter === 'botType') { + var summaryParam={ + url:'/audit-trail/bots-summary?filterBy=botType:'+$scope.botLibFilterBot+'' + }; var param={ url:'/bots?filterBy=botType:'+$scope.botLibFilterBot+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; } else if($scope.botLibFilter === 'taskType') { + var summaryParam={ + url:'/audit-trail/bots-summary?filterBy=botLinkedSubCategory:'+$scope.botLibFilterTask+'' + }; var param={ url:'/bots?filterBy=botLinkedSubCategory:'+$scope.botLibFilterTask+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; } else if($scope.botLibFilter === 'category') { + var summaryParam={ + url:'/audit-trail/bots-summary?filterBy=botCategory:'+$scope.botLibFilterCategory+'' + }; var param={ url:'/bots?filterBy=botCategory:'+$scope.botLibFilterCategory+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder - }; + }; } else { $scope.RefreshBotsLibrary(); } + genSevs.promiseGet(summaryParam).then(function (response) { + $scope.botSummary = response; + $scope.totalSavedTimeForBots = parseInt($scope.botSummary.totalSavedTimeForBots); + }); genSevs.promiseGet(param).then(function (result) { $timeout(function() { $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; $scope.botLibGridOptions.data=result.bots; }, 100); $scope.isBotLibraryPageLoading = false; + $scope.isOpenSidebar = false; }, function(error) { $scope.isBotLibraryPageLoading = false; toastr.error(error); $scope.errorMessage = "No Records found"; + $scope.isOpenSidebar = false; }); }; + + $scope.clearFilter = function() { + $scope.botLibFilter = ''; + $scope.subFilterBy = true; + $scope.filterByBotType = false; + $scope.filterByTaskType = false; + $scope.filterByCategory = false; + //$scope.isOpenSidebar = false; + }; var gridBottomSpace = 265; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace; diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html index 0e6304320..f5f87b863 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -10,6 +10,14 @@ + + Bot Type: {{botLibFilterBot}} + + Task Type: {{botLibFilterTask}} + + Bot Category: {{botLibFilterCategory}} + +
@@ -50,6 +58,7 @@