diff --git a/client/cat3/main.html b/client/cat3/main.html index 876f4b049..47e20ce9d 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -111,6 +111,8 @@ + + diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss index 5b15ebc15..b85ade95c 100644 --- a/client/cat3/src/partials/global.scss +++ b/client/cat3/src/partials/global.scss @@ -728,6 +728,10 @@ accordion .panel-heading { margin-top: 10px; } +.margintop8 { + margin-top: 8px; +} + .marginleft15 { margin-left: 15px; } @@ -740,6 +744,13 @@ accordion .panel-heading { margin-left: 5px; } +#blueprintInfoPage, #botInfoPage { + .td-padding { + padding-left: 18px; + padding-top:16px; + } +} + /* global styles for logs display across workzone ends here*/ /*ui grid css starts here*/ diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index 8a1d84145..75a7f2895 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -4,14 +4,30 @@ font-size: 15px !important; } -.marginbottom10{ - margin-bottom: 10px !important; +.header-name { + text-align: center; +} + +.marginleft23 { + margin-left: 23px; +} + +.paddingbottom10 { + padding-bottom: 10px; } .margintop8 { margin-top: 8px; } +.cookbook-edit-text { + background: #fff; +} + +.marginbottom10{ + margin-bottom: 10px !important; +} + .task-type-img, .bot-status-icon { height: 30px; } 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 b7ecc0482..a74ada9e6 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js @@ -41,6 +41,7 @@ }; genSevs.promiseGet(param).then(function (response) { $scope.botLogs = response; + helper.scrollBottom(); $scope.isBotLogsLoading = false; }); }; @@ -73,9 +74,11 @@ genSevs.promiseGet(param).then(function (response) { if (response) { $scope.jenkinsLogs = helper.formatLogs(response.output); + helper.scrollBottom(); $scope.isBotLogsLoading = false; } else { $scope.jenkinsLogs = helper.formatLogs(response.data.output); + helper.scrollBottom(); $scope.isBotLogsLoading = false; } }); diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js index 1454f81c4..29be3d631 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -9,6 +9,7 @@ "use strict"; angular.module('library.params', []) .controller('editParamsCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', 'responseFormatter', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, responseFormatter) { + $scope.botName = items.name; $scope.taskType = items.taskType; $scope.taggingServerList=[]; $scope.envOptions=[]; 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 86403d016..2ffd2c656 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -8,7 +8,7 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils) { + .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils, $modal) { var treeNames = ['Bots','Library']; $rootScope.$emit('treeNameUpdate', treeNames); var lib=this; @@ -29,8 +29,11 @@ { name: 'BOT Name',displayName: 'BOT Name',field:'name'}, { name: 'Category',field:'botCategory'}, { name: 'description',field:'shortDesc'}, + { name: 'Total Runs',field:'executionCount'}, { name: 'BOT History',displayName: 'BOT History',cellTemplate:'NA'+ ''}, + { name: 'BOT Info',displayName: 'BOT Info',cellTemplate: + ''}, { name: 'BOT Action',displayName: 'BOT Action',cellTemplate:'' + '' + '' @@ -50,6 +53,25 @@ $scope.botLogs = function(bot){ genSevs.botHistory(bot); }; + $scope.botInfo=function(bot) { + var modalInstance = $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/bots/view/botInfo.html', + controller: 'botInfoCtrl', + backdrop : 'static', + keyboard: false, + resolve: { + items: function() { + return bot; + } + } + }); + modalInstance.result.then(function(selectedItem) { + $scope.selected = selectedItem; + }, function() { + console.log('Modal Dismissed at ' + new Date()); + }); + }; $scope.deleteBotTask = function(task) { var modalOptions = { closeButtonText: 'Cancel', @@ -160,6 +182,7 @@ }; genSevs.promiseGet(param).then(function (response) { $scope.botSummary = response; + $scope.totalSavedTimeForBots = parseInt($scope.botSummary.totalSavedTimeForBots); }); }; lib.summary(); @@ -185,5 +208,12 @@ }); }; lib.init(); + }]).controller('botInfoCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { + $scope.botInfo = items; + console.log(items); + + $scope.cancel= function() { + $modalInstance.dismiss('cancel'); + }; }]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html new file mode 100644 index 000000000..b16ae05ce --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html @@ -0,0 +1,90 @@ +
+
+ × +

+ Bot Info - {{botInfo.name}} +

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ParametersValues
BOT Name + +
Task Type: + +
Bot Type + +
Category + +
Description + +
Last BOT Execution + + + +
Job Name + +
Job URL + +
Script Type Name + +
+
+
+ +
+ +
+
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index 08e1c9fda..60d344947 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -1,7 +1,9 @@ + +
× -

  Execute Bot

+

  Execute Bot - {{botName}}

@@ -50,6 +52,7 @@

Edit Parameters:

Name + Description Value @@ -58,6 +61,9 @@

Edit Parameters:

{{params.name}} + + {{params.description}} + - - - + +
@@ -290,6 +289,12 @@
+
+ + + mins +
@@ -85,7 +82,7 @@
Job Details
-
+
+
+ +
+ + + + + + minutes + + +