From 9cd53df75caf1483e7651f0963e72929ed216567 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Fri, 16 Sep 2016 11:44:07 +0530 Subject: [PATCH 1/3] Resolved QA bugs for AWS Capacity --- client/htmls/public/awsCapacity.html | 4 +++- client/htmls/public/js/awsCapacity.js | 1 + client/htmls/public/js/dashboard.js | 1 + seed/mongodump/devops_new/tracks.bson | Bin 1061 -> 1150 bytes 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/htmls/public/awsCapacity.html b/client/htmls/public/awsCapacity.html index 95cc81804..322700dc0 100644 --- a/client/htmls/public/awsCapacity.html +++ b/client/htmls/public/awsCapacity.html @@ -36,6 +36,7 @@
+
@@ -91,9 +92,10 @@

0

+
diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index d887a8374..8f9d086bf 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -59,6 +59,7 @@ $(document).ready(function() { if (data.length === 0) { $('.providerValues').addClass('hidden'); $('.noProviderView').show(); + $('#instanceActionListLoader').hide(); } else { for (var i = 0; i < data.length; i++) { $('.noProviderView').hide(); diff --git a/client/htmls/public/js/dashboard.js b/client/htmls/public/js/dashboard.js index 0c53d2c9d..ae27f9fa1 100644 --- a/client/htmls/public/js/dashboard.js +++ b/client/htmls/public/js/dashboard.js @@ -195,6 +195,7 @@ $(document).ready(function () { } } else { $('.noProviderView').show(); + $('#totalProviders').append(totalcountproviders); } }).fail(function () { diff --git a/seed/mongodump/devops_new/tracks.bson b/seed/mongodump/devops_new/tracks.bson index 31d5fa4b72bb7805ce981da49fe2d256a041aa4d..e52c2e2faa6c6e2bee30bf7ff922f02de64ec1c8 100644 GIT binary patch delta 170 zcmZ3=@sDFeEhCdC)8u+aLyjAa3=GT$3>PNvV9aAon5@p^&3(Jo;%@WYO#YSYRVUY? z@Kq*XX7Wuz$SX528#9D4FfcIXCFZ6whyYoR;lT>di3N$tnI)A9L8%4#MI{VOrA0Xm ol0ZrQg3_d%%w+w<@?w}8y^NCF90vCI%oK)jguzOawV8hb01y#5_W%F@ delta 81 zcmeyzv6N#&EhEz&#>w@Jh8*>b3=GT$4CRw|Fy=9`PgZC0=H9i6RW`NkY{(St;>oor S{G!R1nS7Dt3n#ZQ{{jFXksLq( From e65d0fa77392eec75b89b64b11d0793ec04efae4 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Fri, 16 Sep 2016 12:20:55 +0530 Subject: [PATCH 2/3] Highlighting the selected box for capacity dashboard --- client/htmls/public/awsCapacity.html | 6 +++--- client/htmls/public/css/capacity.css | 5 +++++ client/htmls/public/js/awsCapacity.js | 12 +++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/client/htmls/public/awsCapacity.html b/client/htmls/public/awsCapacity.html index 322700dc0..eae443bb0 100644 --- a/client/htmls/public/awsCapacity.html +++ b/client/htmls/public/awsCapacity.html @@ -51,7 +51,7 @@

0

-
+

0

Total
No. of Managed Instances

@@ -65,7 +65,7 @@

0

-
+

0

Total
No. of Assigned Instances

@@ -79,7 +79,7 @@

0

-
+

0

Total
No. of UnAssigned Instances

diff --git a/client/htmls/public/css/capacity.css b/client/htmls/public/css/capacity.css index 9fceadeb6..b074d2d29 100644 --- a/client/htmls/public/css/capacity.css +++ b/client/htmls/public/css/capacity.css @@ -75,3 +75,8 @@ #instanceUnAssignedContainer { min-height: 280px; } + +.selectComponent { + border: 5px solid #396ea2; + margin-top: -5px; +} diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index 8f9d086bf..949bdcdfd 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -195,7 +195,9 @@ $(document).ready(function() { } $('#totalManagedInstancesMoreInfo').on('click', function() { - //$(this).css('box-shadow', '10px 10px 5px #888'); + $('.unassignedBox').removeClass('selectComponent'); + $('.assignedBox').removeClass('selectComponent'); + $('.totalBox').addClass('selectComponent'); loadAllManagedInstances(); $('#instanceTableContainer').show(); $('#instanceAssignedContainer').hide(); @@ -203,7 +205,9 @@ $(document).ready(function() { }); $('#totalUnManagedInstancesMoreInfo').on('click', function() { - //$(this).css('box-shadow', '10px 10px 5px #888'); + $('.unassignedBox').removeClass('selectComponent'); + $('.totalBox').removeClass('selectComponent'); + $('.assignedBox').addClass('selectComponent'); loadAllUnManagedInstances(); $('#instanceTableContainer').hide(); $('#instanceUnAssignedContainer').hide(); @@ -211,7 +215,9 @@ $(document).ready(function() { }); $('#totalUnAssignedInstancesMoreInfo').on('click', function() { - //$(this).addClass('shadow'); + $('.totalBox').removeClass('selectComponent'); + $('.assignedBox').removeClass('selectComponent'); + $('.unassignedBox').addClass('selectComponent'); getUnassignedInstancesWithProjectAndEnv(); $('#instanceTableContainer').hide(); $('#instanceAssignedContainer').hide(); From 2cdb3133704b76ae1ec884fe7d68c493accf816c Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Fri, 16 Sep 2016 12:23:21 +0530 Subject: [PATCH 3/3] Clearing the selected box --- client/htmls/public/js/awsCapacity.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index 949bdcdfd..2124bdee3 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -22,6 +22,9 @@ $(document).ready(function() { $('#instanceAssignedContainer').hide(); $('#instanceUnAssignedContainer').hide(); $('.footer').addClass('hidden'); + $('.unassignedBox').removeClass('selectComponent'); + $('.assignedBox').removeClass('selectComponent'); + $('.totalBox').removeClass('selectComponent'); } $("#refreshBtn").click(function() {