Enhancements and bug fixes

client/cat3/main.html

@@ -36,9 +36,6 @@
 		<script src="lib/lodash/lodash/lodash.min.js"></script>
 		<script src="lib/ng-file-upload/ng-file-upload.min.js"></script>
 		<script src="src/partials/globals/toaster/angular-toastr.tpls.js"></script>
-		<script src="src/partials/globals/drag-and-drop/angular-drag-and-drop-lists.min.js"></script>
-		<script src="https://cdn.firebase.com/js/client/1.1.1/firebase.js"></script>
-		<script src="https://cdn.firebase.com/libs/angularfire/0.8.0/angularfire.min.js"></script>
 		<!-- Application configuration -->
 		<script src="uiConfig.js"></script>
 		<script src="lib/d3/d3.js"></script>
@@ -119,7 +116,10 @@
 
 		<script src="src/partials/sections/dashboard/bots/botsCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/controller/audittrailCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/bots/controller/botDescriptionCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/controller/botLogsCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js"></script>
         <script src="src/partials/sections/dashboard/bots/controller/libraryCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/controller/editParamsCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js"></script>

client/cat3/src/main.js

@@ -12,7 +12,7 @@
  * All modules/feature will be through
  * */
 
-var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr','firebase',
+var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr',
 	'global.login',
 	'global.breadcrumb',
 	'authentication',

client/cat3/src/partials/global.scss

@@ -1461,4 +1461,23 @@ div::-webkit-scrollbar-thumb
 }
 input[type="text"].ui-grid-filter-input{
     color: #000000;
+}
+
+// grid view tab class
+.hide-grid {
+    margin: 0px auto !important;
+    padding: 0px !important;
+    visibility: hidden;
+    height: 0px !important;
+    overflow: hidden;
+}
+
+.show-grid-tab {
+    visibility: visible;
+    height: auto;
+}
+
+.show-grid {
+    visibility: inherit;
+    height: auto;
 }

client/cat3/src/partials/globals/loader/loaderModule.js

@@ -9,17 +9,17 @@
 	'use strict';
 	angular.module('directive.loading', [])
 		.directive('loading', ['$compile',function($compile) {
-			var getTemplate = function(type) {
+			var getTemplate = function(type, extraClasses) {
 				var template = '';
 				switch (type) {
 					case 'block':
-						template = "<h1 class='catloader block'><i class='fa fa-cog fa-spin black'></i> Loading...</h1>";
+						template = "<h1 class='catloader block'><i class='fa fa-cog fa-spin "+extraClasses+"'></i> Loading...</h1>";
 						break;
 					case 'inline':
-						template = "<span class='catloader inline'><i class='fa fa-spinner fa-spin black'></i></span>";
+						template = "<span class='catloader inline'><i class='fa fa-spinner fa-spin "+extraClasses+"'></i></span>";
 						break;
 					default:
-						template = "<h1 class='catloader block'><i class='fa fa-cog fa-spin black'></i> Loading...</h1>";
+						template = "<h1 class='catloader block'><i class='fa fa-cog fa-spin "+extraClasses+"'></i> Loading...</h1>";
 						break;
 				}
 				return template;
@@ -35,7 +35,8 @@
 						}
 					});
 					var type = attrs.type;
-					var template = getTemplate(type);
+					var extraClasses = (attrs.classes)?attrs.classes:'black';
+					var template = getTemplate(type,extraClasses);
 					elm.html('').append($compile(template)(scope));
 					scope.$watch(scope.dirLoading, function(v) {
 						var size = attrs.size;

client/cat3/src/partials/sections/dashboard/analytics/analytics.html

@@ -125,7 +125,7 @@
 						<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'month'}" ng-click="applyFilter(true,'month')">MONTH</button>
 						<!--<button type="button" class="btn btn-sm btn-primary cat-btn-update" disabled="disabled" ng-class=" {'active':filterNewEnt.period === 'year'}"  ng-click="applyFilter(true,'year')">YEAR</button>-->
 						<!--<input  class="form-control " ng-model="filterNewEnt.StartDate" style="display: table-cell;width: 120px" readonly   />-->
-						<input id="date-select" class="form-control " ng-click="showPick=true" ng-model="filterNewEnt.date" style="display: table-cell;width: 120px"  placeholder="From Date" ng-change="applyFilter(true,filterNewEnt.period);" title="End Date" />
+						<input id="date-select" class="form-control " ng-click="showPick=true" ng-model="filterNewEnt.date" style="display:inherit;width: 120px"  placeholder="From Date" ng-change="applyFilter(true,filterNewEnt.period);" title="End Date" />
 						<div class="weekPick" ng-show="showPick">
 							<span ng-show="filterNewEnt.period === 'day'"> <label for="" >Select Date</label>
 								<input  class="form-control marginbottom10" id="date-cost" ng-model="filterNewEnt.endDate.day"   />

client/cat3/src/partials/sections/dashboard/analytics/analytics.js

@@ -128,7 +128,8 @@
 		$rootScope.$emit('HEADER_NAV_CHANGE', 'ANALYTICS');
 		$scope.selectedResources = [];
 		analytic.viewByFilter='orgView';
-		$scope.$watch(function() { return analytic.viewByFilter}, function(newVal) {
+		$scope.$watch(function() { 
+			return analytic.viewByFilter}, function(newVal) {
 			if(newVal === 'ProviderView'){
 				$rootScope.viewType='ProviderView';
 				if($state.params && $state.params.filterView){

client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js

@@ -18,10 +18,10 @@
                         month:months[new Date().getMonth()],
                         day:moment(new Date()).format('YYYY-MM-DD')
                     };
-                    $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year;
+                    $rootScope.filterNewEnt.date= moment($rootScope.filterNewEnt.endDate.month+' 01 '+ $rootScope.filterNewEnt.endDate.year).format('YYYY-MM-DD');
                 },
                 applyFilter : function(filterApp,period){
-                    $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year;
+                    $rootScope.filterNewEnt.date= moment($rootScope.filterNewEnt.endDate.month+' 01 '+ $rootScope.filterNewEnt.endDate.year).format('YYYY-MM-DD');
                     if($rootScope.organObject) {
                         var obj = $rootScope.organObject,
                             or = $rootScope.organNewEnt.org,
@@ -36,7 +36,7 @@
                                 console.log(moment(dt).add(wk, 'days').format('YYYY-MM-DD'));
                                 $rootScope.filterNewEnt.date=moment(dt).add(wk, 'days').format('YYYY-MM-DD');
                             } else {
-                                $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year;
+                                $rootScope.filterNewEnt.date=moment( $rootScope.filterNewEnt.endDate.month+' 01 '+ $rootScope.filterNewEnt.endDate.year).format('YYYY-MM-DD');
                             }
                             $rootScope.filterNewEnt.period = period;
                         }

client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js

@@ -14,47 +14,8 @@
             };
             var capRept =this;
             capRept.chartData=[];
+            capRept.serviceType='EC2';
             capRept.splitUp=null;
-            capRept.getCapacityData=function(fltObj){
-                var param = {
-                    // url: 'src/partials/sections/dashboard/analytics/data/cost.json?org'
-                    url:''
-                };
-                if(fltObj && fltObj.org){
-                    var entityId=null;
-                    if(fltObj.provider){
-                        entityId=fltObj.provider.id;
-                    } else {
-                        entityId=fltObj.org.id;
-                    }
-                    //param.url='http://d4d.rlcatalyst.com/analytics/capacity?parentEntityId=46d1da9a-d927-41dc-8e9e-7e926d927537&entityId=46d1da9a-d927-41dc-8e9e-7e926d927537&toTimeStamp=Mon%20Nov%2014%202016%2010:41:29%20GMT+0530%20(IST)&period=month';
-                   param.url='/analytics/capacity?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date()+'&period=month';
-                }
-
-                genSevs.promiseGet(param).then(function (result) {
-                    capRept.chartData=result;
-                    $rootScope.splitUpCapacities=[];
-                    capRept.serviceCapacity=result.capacity.AWS;
-                    //capRept.serviceType=Object.keys(capRept.serviceCapacity.services)[0];
-                    capRept.serviceType='EC2';
-                    if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0) {
-                        angular.forEach(result.splitUpCapacities, function (val, key) {
-                            var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) {
-                                return str.toUpperCase();
-                            });
-                            $rootScope.splitUpCapacities.push({id:key,val:a});
-                        });
-                        if( $rootScope.splitUpCapacities && $rootScope.splitUpCapacities.length >0) {
-                            $scope.$emit('CHANGE_splitUp', $rootScope.splitUpCapacities[0].id);
-                            capRept.splitUp = $rootScope.splitUpCapacities[0].val;
-                            capRept.createLable(result, $rootScope.splitUpCapacities[0].id);
-                        }
-                    }
-                    capRept.createList();
-
-                });
-            };
-
             $rootScope.applyFilter =function(filterApp,period){
                 analyticsServices.applyFilter(filterApp,period);
                 if($state.current.name === "dashboard.analytics.capacityReport") {
@@ -67,7 +28,7 @@
                 $rootScope.$emit('INI_usage', 'Unassigned');
                 $timeout(function () {
                     $rootScope.applyFilter(true,'month');
-                    capRept.getCapacityData($rootScope.filterNewEnt);
+                    capRept.createList();
                     var treeNames = ['Cloud Management','Analytics','capacity'];
                     $rootScope.$emit('treeNameUpdate', treeNames);
                 },500);
@@ -93,8 +54,11 @@
                 });
             };
             $scope.chefConfig=function (id) {
-                var promise = genSevs.editRunlist(id);
+                genSevs.editRunlist(id);
             };
+            $scope.monthNames = ["January", "February", "March", "April", "May", "June","July", "August", "September", "October", "November", "December"];
+
+            $scope.currentMonth =  $scope.monthNames[new Date().getMonth()];
             capRept.createList = function () {
                 capRept.filterValue='';
                 capRept.listGrid=[];
@@ -106,8 +70,8 @@
                     capRept.listGrid[value].data=[];
                     capRept.listGrid[value].paginationPageSizes= [25, 50, 100];
                     capRept.listGrid[value].paginationPageSize=25;
-                    $scope.colArray=['platformId','state','orgName','privateIpAddress','os'];
-                    if(capRept.serviceType === 'EC2') {
+                    $scope.colArray=['platformId','state','privateIpAddress','os'];
+         if(capRept.serviceType === 'EC2') {
                     capRept.listGrid[value].columnDefs = [
                         {name: 'Instance Id', field: 'platformId', cellTooltip: true},
                         {name: 'os', enableFiltering: true, displayName: 'OS', field: 'os', cellTooltip: true},
@@ -118,10 +82,9 @@
                             field: 'region',
                             cellTooltip: true
                         },
-                        {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true},
                         {
                             name: 'cost',
-                            displayName: 'Cost',
+                            displayName: 'Cost ( '+$scope.currentMonth+' )',
                             cellTemplate: '<span ng-bind-html="grid.appScope.aggregateInstanceCost(row.entity.cost)"></span>'
                         },
                         {
@@ -134,7 +97,7 @@
                     ];
                 }
                 if(capRept.serviceType === 'RDS') {
-                    $scope.colArray=['platformId','state','orgName','dbEngine']
+                    $scope.colArray=['platformId','state','dbEngine'];
                     capRept.listGrid[value].columnDefs = [
                         {name: 'Instance', field: 'platformId', cellTooltip: true},
                         {name: 'dbEngine', enableFiltering: true, displayName: 'Engine', field: 'dbEngine', cellTooltip: true},
@@ -144,10 +107,9 @@
                             field: 'region',
                             cellTooltip: true
                         },
-                        {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true},
                         {
                             name: 'cost',
-                            displayName: 'Cost',
+                            displayName: 'Cost ( '+$scope.currentMonth+' )',
                             cellTemplate: '<span ng-bind-html="grid.appScope.aggregateInstanceCost(row.entity.cost)"></span>'
                         },
                         {
@@ -165,24 +127,27 @@
                         {name: 'bucketName', field: 'bucketName', cellTooltip: true},
                         {name: 'bucketOwnerName', field: 'bucketOwnerName', cellTooltip: true},
                         {name: 'bucketSize', field: 'bucketSize', displayName:'Bucket Size (MB)', cellTooltip: true},
-                        {name: 'orgName', field: 'orgName', cellTooltip: true},
-                        {name: 'cost', displayName: 'Cost',cellTemplate: '<span ng-bind-html="grid.appScope.aggregateInstanceCost(row.entity.cost)"></span>'},
+
+                        {name: 'cost',  displayName: 'Cost ( '+$scope.currentMonth+' )',cellTemplate: '<span ng-bind-html="grid.appScope.aggregateInstanceCost(row.entity.cost)"></span>'},
                         {name: 'Action', cellTooltip: true,cellTemplate:"<span class='cursor' title='Usage' style='font-size: 14px;' ng-click='grid.appScope.openChart(row.entity)'><i class=\"fa fa-line-chart\"></i></span> "}
                     ];
                 }
                     capRept.listGrid[value].onRegisterApi=function (gridApi) {
                        gridApi.grid.registerRowsProcessor($scope.singleFilter, 200);
                         $scope.gridApi = gridApi;
                     };
-
                 if(capRept.serviceType === 'EC2' && fltrObj && fltrObj.provider && fltrObj.provider.id) {
                     if($rootScope.organNewEnt.instanceType === 'Managed') {
-                        $scope.colArray.push('bgName');
-                        capRept.listGrid[value].columnDefs.splice(6,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true});
+                        $scope.colArray.push('bgName','projectName','environmentName');
+                        capRept.listGrid[value].columnDefs.splice(5,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true});
+                        capRept.listGrid[value].columnDefs.splice(6,0,{name: 'projectName', displayName: 'Project Name', field: 'projectName', cellTooltip: true});
+                        capRept.listGrid[value].columnDefs.splice(7,0,{name: 'environmentName', displayName: 'Env Name', field: 'environmentName', cellTooltip: true}); $scope.instanceType= 'managedInstances';
                         $scope.instanceType= 'managedInstances';
                     } else if($rootScope.organNewEnt.instanceType === 'Assigned'){
-                        $scope.colArray.push('bgName');
-                        capRept.listGrid[value].columnDefs.splice(6,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true});
+                        $scope.colArray.push('bgName','projectName','environmentName');
+                        capRept.listGrid[value].columnDefs.splice(5,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true});
+                        capRept.listGrid[value].columnDefs.splice(6,0,{name: 'projectName', displayName: 'Project Name', field: 'projectName', cellTooltip: true});
+                        capRept.listGrid[value].columnDefs.splice(7,0,{name: 'environmentName', displayName: 'Env Name', field: 'environmentName', cellTooltip: true}); $scope.instanceType= 'managedInstances';
                         $scope.instanceType= 'unmanagedInstances';
                     } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){
                         $scope.instanceType= 'unassigned-instances';
@@ -222,12 +187,12 @@
                         }
                     });
                 } else if(fltrObj && fltrObj.provider && fltrObj.provider.id){
-                    var param = {
+                    var paramResources= {
                         inlineLoader:true,
                        url: '/resources?filterBy=providerDetails.id:'+fltrObj.provider.id+',resourceType:'+capRept.serviceType+',category:'+$rootScope.organNewEnt.instanceType.toLowerCase()
                        // url:'src/partials/sections/dashboard/analytics/data/ins.json'
                     };
-                    genSevs.promiseGet(param).then(function (instResult) {
+                    genSevs.promiseGet(paramResources).then(function (instResult) {
                         /////
                         capRept.listGrid[value].data = instResult.data;
                             if(capRept.serviceType === 'RDS'){
@@ -265,7 +230,7 @@
 
                 //}
             };
-            $scope.$watch('capRept.serviceType',function (newValue, oldValue) {
+            $scope.$watch('capRept.serviceType',function () {
                 capRept.createList();
             });
             $scope.aggregateInstanceCost=function (cost) {
@@ -363,11 +328,11 @@
             var $yesterday = new Date($today);
             $yesterday.setDate($today.getDate() - 1);
             if(fltObj && fltObj.resources && fltObj.resources.length >0) {
-                var  $today = new Date();
-                var $yesterday = new Date($today);
-                $yesterday.setDate($today.getDate() - 1);
+                var  $todayA = new Date();
+                var $yesterdayA = new Date($todayA);
+                $yesterdayA.setDate($todayA.getDate() - 1);
                     var param = {
-                        url: '/analytics/trend/usage?resource=' + items._id + '&fromTimeStamp=' + $yesterday + '&toTimeStamp=' + $today + '&interval=3600'
+                        url: '/analytics/trend/usage?resource=' + items._id + '&fromTimeStamp=' + $yesterdayA + '&toTimeStamp=' + $todayA + '&interval=3600'
                         //url:'src/partials/sections/dashboard/analytics/data/usage.json'
                     };
                     genSevs.promiseGet(param).then(function (result) {

client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js

@@ -114,6 +114,7 @@
                     }
 
                  // param.url='src/partials/sections/dashboard/analytics/data/cost.json';
+                    console.log(fltObj.date);
                    param.url='/analytics/cost/aggregate?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date(fltObj.date)+'&period='+fltObj.period;
                 }