diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index e4177a055..8576527b9 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -20,16 +20,12 @@ height: 50px; } -#botLibraryPage { +#botLibraryPage, #botAuditTrailPage { .page-name { font-size: 18px; margin: 5px 0 5px 10px; } - .borderTop { - border-top: 1px dashed #ddd; - } - .btn-xs { padding: 1px 5px; font-size: 12px; @@ -39,23 +35,44 @@ margin: 2px 10px 0 0; } + .borderTop { + border-top: 1px dashed #ddd; + } +} + +#botLibraryPage { .summary-container { width: 100%; } .selected { - border: 2px solid #000; - height: 94px !important; - margin-top: 13px !important; + height: 92px !important; + margin-top: 14px !important; + } + + .selected-blue { + color: #00c0ef !important; + border: 1px solid #00c0ef !important; + } + + .selected-green { + color: #00a65a !important; + border: 1px solid #00a65a !important; + } + + .selected-red { + color: #dd4b39 !important; + border: 1px solid #dd4b39 !important; } .info-box { display: block; min-height: 90px; - background: #ecf0f5; + background: #fff; width: 100%; box-shadow: 0 1px 1px rgba(0,0,0,0.1); margin: 15px 0; + border: 1px solid #ccc; } .info-box-content { @@ -84,8 +101,8 @@ .info-box-icon { display: block; float: left; - height: 90px; - width: 90px; + height: 88px; + width: 88px; text-align: center; font-size: 45px; line-height: 90px; diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js index 2237353a2..3ea895ba0 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js @@ -45,7 +45,7 @@ ], data:[] }; - var gridBottomSpace = 5; + var gridBottomSpace = 40; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botAuditTrailPage') - gridBottomSpace; $scope.botAuditTrailLogs=function(hist) { @@ -68,6 +68,10 @@ }); }; + $scope.RefreshBotsAuditTrail = function() { + audit.init(); + }; + audit.init =function(){ audit.gridOptions.data=[]; var param={ diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js index 57d1ca9f3..b7ecc0482 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js @@ -33,8 +33,10 @@ } }; $scope.instanceChange =function(){ + $scope.isBotLogsLoading = true; $scope.botLogs=[]; var param={ + inlineLoader: true, url:'/audit-trail/' + $scope.selectedInstance.actionLogId + '/logs' }; genSevs.promiseGet(param).then(function (response) { @@ -65,14 +67,15 @@ }); if($scope.taskType === 'jenkins') { var param={ + inlineLoader: true, url:'/jenkins/' + $scope.jenkinsActionLogId + '/jobs/testmail/builds/' + $scope.jenkinsBuildNumber + '/output' }; genSevs.promiseGet(param).then(function (response) { - if (response.data) { - $scope.jenkinsLogs = helper.formatLogs(response.data.output); + if (response) { + $scope.jenkinsLogs = helper.formatLogs(response.output); $scope.isBotLogsLoading = false; } else { - $scope.jenkinsLogs = helper.formatLogs(response.output); + $scope.jenkinsLogs = helper.formatLogs(response.data.output); $scope.isBotLogsLoading = false; } }); 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 dd78cb560..c2f3f8060 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -30,7 +30,7 @@ { name: 'Category',field:'botCategory'}, { name: 'description',field:'shortDesc'}, { name: 'BOT History',displayName: 'BOT History',cellTemplate:'NA'+ - ''}, + ''}, { name: 'BOT Action',displayName: 'BOT Action',cellTemplate:'' + '' + '' @@ -95,12 +95,14 @@ }); }; $rootScope.$on('BOTS_LIBRARY_REFRESH', function() { + lib.summary(); lib.init(); }); $scope.RefreshBotsLibrary = function() { $scope.totalBotsSelected = true; $scope.runningBotsselected = false; $scope.failedBotsselected = false; + lib.summary(); lib.init(); }; $scope.showBotsRunning = function() { diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html index a63c7ce99..9941d03e9 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html @@ -1,6 +1,14 @@