diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss
index 96a95bfa1..6e59fdb63 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss
+++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss
@@ -16,6 +16,10 @@
padding-bottom: 10px;
}
+.paddingbottom20 {
+ padding-bottom: 20px;
+}
+
.margintop8 {
margin-top: 8px;
}
@@ -36,115 +40,61 @@
height: 50px;
}
-#botAuditTrailPage {
- .ui-grid-column-menu-button {
- display: none;
- }
+.param-table {
+ max-height: 400px;
+ overflow-y: auto;
}
#botLibraryPage, #botAuditTrailPage {
.page-name {
- font-size: 18px;
- margin: 5px 0 5px 10px;
+ font-size: 18px;
+ margin: 5px 0 5px 10px;
}
.btn-xs {
- padding: 1px 5px;
- font-size: 12px;
+ padding: 1px 5px;
+ font-size: 12px;
}
.refresh-btn {
margin: 2px 10px 0 0;
}
- .borderTop {
- border-top: 1px dashed #ddd;
- }
-}
-
-#botLibraryPage {
- .summary-container {
- width: 100%;
- }
-
- .selected {
- height: 92px !important;
- margin-top: 14px !important;
+ .search-text {
+ font-weight: normal;
}
- .selected-blue {
- color: #00c0ef !important;
- border: 1px solid #00c0ef !important;
+ .bot-search {
+ -webkit-appearance: textfield !important;
}
- .selected-green {
- color: #00a65a !important;
- border: 1px solid #00a65a !important;
- }
-
- .selected-red {
- color: #dd4b39 !important;
- border: 1px solid #dd4b39 !important;
+ .borderTop {
+ border-top: 1px dashed #ddd;
}
+}
- .info-box {
- display: block;
- min-height: 90px;
- background: #fff;
+#botLibraryPage {
+ .summary-container {
width: 100%;
- box-shadow: 0 1px 1px rgba(0,0,0,0.1);
- margin: 15px 0;
- border: 1px solid #ccc;
- }
-
- .info-box-content {
- padding: 5px 10px;
- margin-left: 90px;
}
- .info-box-text {
- text-transform: uppercase;
+ .bot-library-search {
+ height: 33px;
+ margin-right: 12px;
}
- .info-box-text {
- display: block;
- font-size: 13px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
-
- .info-box-number {
- display: block;
- font-weight: bold;
- font-size: 20px;
- }
-
- .info-box-icon {
- display: block;
- float: left;
- height: 88px;
- width: 88px;
- text-align: center;
- font-size: 45px;
- line-height: 90px;
- background: rgba(0,0,0,0.2);
- }
-
- .bg-aqua {
- background-color: #00c0ef !important;
- }
-
- .bg-green {
- background-color: #00a65a !important;
+ .section-bottom-glyph {
+ position: absolute;
+ top: 140px;
+ left: 97px;
+ font-size: 22px;
+ display: none;
}
- .bg-red {
- background-color: #dd4b39 !important;
+ .selected-section {
+ display: block !important;
}
-}
-#botLibraryPage{
.circle-tile {
margin-bottom: 15px;
text-align: center;
@@ -152,21 +102,22 @@
.circle-tile-heading {
position: relative;
- width: 80px;
- height: 80px;
- margin: 10px auto -40px;
- border: 3px solid rgba(255,255,255,0.3);
+ width: 65px;
+ height: 65px;
+ margin: 10px auto -35px;
+ border: 3px solid rgba(255, 255, 255, 0.3);
border-radius: 100%;
color: #fff;
- padding-top: 16px;
+ padding-top: 15px;
transition: all ease-in-out .3s;
}
.circle-tile-number {
- padding: 5px 0 15px;
+ padding: 5px 0 6px;
font-size: 26px;
font-weight: 700;
line-height: 1;
+ height: 37px;
}
.circle-tile-content {
@@ -186,6 +137,14 @@
background-color: #00c0ef;
}
+ .dark-blue-glyph {
+ color: #00c0ef;
+ }
+
+ .green-glyph {
+ color: #00a65a;
+ }
+
.green {
background-color: #00a65a;
}
@@ -194,10 +153,34 @@
background-color: #f39c12;
}
- .red {
+ .redcard {
background-color: #e74c3c;
}
+ .redcard-glyph {
+ color: #e74c3c;
+ }
+
+ .bg-blue {
+ background-color: #2980b9;
+ }
+
+ .bg-blue-glyph {
+ color: #2980b9;
+ }
+
+ .font-size-16 {
+ font-size: 16px;
+ }
+
+ a.cursor {
+ padding: 0 5px;
+ }
+
+ .margin-21 {
+ margin: 0 20px;
+ }
+
#botLibraryPage .selected-blue {
border: none !important;
}
@@ -205,27 +188,21 @@
.ui-grid-cell{
border-right:none !important;
}
-
- /*global css*/
- .ui-grid .ui-grid-row {
- border-bottom: 1px solid #ccc;
- }
}
-.bot-library-search {
- height: 33px;
- margin-right: 12px;
-}
-.bot-audit-trail-search {
- height: 31px;
- margin: 6px 9px 0 0px;
-}
+#botAuditTrailPage {
+ .bot-audit-trail-search {
+ height: 31px;
+ margin: 6px 9px 0 0px;
+ }
-.search-text {
- font-weight: normal;
+ .ui-grid-column-menu-button {
+ display: none;
+ }
}
-.bot-search {
- -webkit-appearance: textfield !important;
+/*global css*/
+.ui-grid .ui-grid-row {
+ border-bottom: 1px solid #ccc;
}
\ No newline at end of file
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 305420cf8..cec610bc3 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -34,14 +34,15 @@
{ name: 'description',field:'botDesc',cellTooltip: true},
{ name: 'Organization',field:'masterDetails.orgName',cellTooltip: true},
{ 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:
- '' +
- '' +
- ''
+ { name: 'BOT Action',width:200,displayName: 'BOT Action',cellTemplate:
+ // ''+
+ ''+
+ ''+
+ //''+
+ '' +
+ '' +
+ //'' +
+ ''
}
]
$scope.botLibGridOptions.data=[];
@@ -127,7 +128,7 @@
$scope.errorMessage = "No Records found";
});
};
- var gridBottomSpace = 225;
+ var gridBottomSpace = 265;
$scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace;
$scope.launchInstance = function(launch){
if(launch.botLinkedCategory === 'Task'){
@@ -214,6 +215,8 @@
$scope.botLibraryGridView();
} else if($scope.runningBotsselected) {
$scope.showBotsRunning();
+ } else if($scope.scheduledBotsSelected) {
+ $scope.showScheduledBots();
} else if($scope.failedBotsselected) {
$scope.showFailedBots();
} else {
@@ -236,6 +239,8 @@
$scope.botLibraryGridView();
} else if($scope.runningBotsselected) {
$scope.showBotsRunning();
+ } else if($scope.scheduledBotsSelected) {
+ $scope.showScheduledBots();
} else if($scope.failedBotsselected) {
$scope.showFailedBots();
} else {
@@ -246,6 +251,7 @@
$scope.totalBotsSelected = true;
$scope.runningBotsselected = false;
$scope.failedBotsselected = false;
+ $scope.scheduledBotsSelected = false;
lib.summary();
$scope.botLibraryGridView();
};
@@ -253,6 +259,7 @@
$scope.runningBotsselected = true;
$scope.totalBotsSelected = false;
$scope.failedBotsselected = false;
+ $scope.scheduledBotsSelected = false;
lib.gridOptions.data=[];
var param={
url:'/bots?actionStatus=running&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
@@ -269,6 +276,7 @@
$scope.failedBotsselected = true;
$scope.runningBotsselected = false;
$scope.totalBotsSelected = false;
+ $scope.scheduledBotsSelected = false;
lib.gridOptions.data=[];
var param={
url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
@@ -281,6 +289,23 @@
});
lib.summary();
};
+ $scope.showScheduledBots = function() {
+ $scope.failedBotsselected = false;
+ $scope.runningBotsselected = false;
+ $scope.totalBotsSelected = false;
+ $scope.scheduledBotsSelected = true;
+ lib.gridOptions.data=[];
+ var param={
+ url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder
+ };
+ genSevs.promiseGet(param).then(function (result) {
+ $timeout(function() {
+ $scope.botLibGridOptions.totalItems = result.metaData.totalRecords;
+ $scope.botLibGridOptions.data=result.bots;
+ }, 100);
+ });
+ lib.summary();
+ };
lib.summary = function() {
$scope.botSummary=[];
var param={
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 4c81a396a..18d05e419 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html
@@ -1,6 +1,7 @@
+