automatically merge

client/cat3/main.html

@@ -117,7 +117,6 @@
 		<script src="src/partials/sections/dashboard/bots/controller/audittrailCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/controller/botLogsCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/controller/botInfoCtrl.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/design/aDesignCtrl.js"></script>

client/cat3/src/clientRoutes.js

@@ -36,6 +36,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
 		url: "/workzone",
 		templateUrl: "src/partials/sections/dashboard/workzone/workzone.html",
 		controller: "workzoneCtrl",
+		params:{filterView:{workzone:true}},
 		onEnter: function () {
 		},
 		onExit: function () {
@@ -57,6 +58,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
 		url: "/design",
 		templateUrl: "src/partials/sections/dashboard/design/design.html",
 		controller: "designCtrl as desCtrl",
+		params:{filterView:{design:true}},
 		resolve: {
 			auth: ["$q", function ($q) {
 				var deferred = $q.defer();
@@ -74,6 +76,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
 		url: "/CM/",
 		templateUrl: "src/partials/sections/dashboard/analytics/analytics.html",
 		controller: "analyticsCtrl as analytic",
+		params:{filterView:{analytics:true}},
 		resolve: {
 			auth: ["$q", function ($q) {
 				var deferred = $q.defer();
@@ -92,6 +95,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
 		url: "/bots",
 		templateUrl: "src/partials/sections/dashboard/bots/bots.html",
 		controller: "botsCtrl as bts",
+		params:{filterView:{bots:true}},
 		resolve: {
 			auth: ["$q", function ($q) {
 				var deferred = $q.defer();

client/cat3/src/factory/workzoneServices.js

@@ -532,7 +532,7 @@
 					return $http.get(fullUrl(url),Auth.getHeaderObject());
 				},
 				getBotTypeList:function () {
-					var url ='/config-data/bot-type';
+					var url ='/config-data/bots-type';
 					return $http.get(fullUrl(url),Auth.getHeaderObject());
 				},
 				getTaggingServer:function () {

client/cat3/src/main.js

@@ -101,6 +101,9 @@ angularApp.controller('HeadNavigatorCtrl', ['$scope', '$rootScope', '$http', '$l
 		$rootScope.analyticsBool = _permSet.analyticsBool;
 		$rootScope.serviceBool = _permSet.serviceBool;
 	});
+	$scope.$watch(function() {
+		$rootScope.moduleSelection = $state.params;
+	});
 	$rootScope.$emit('SET_HEADER', $rootScope.appDetails);
 	$scope.showLogoutConfirmationSection = false;
 	$scope.logoutConfirmation = function () {

client/cat3/src/partials/globals/header/header.scss

@@ -18,6 +18,10 @@
 		.cursor {
 			cursor:pointer;
 		}
+
+		.header-selected-item {
+			color: #40BAF1;
+		}
 
 		.header-logo-image {
 			height: 40px;  

client/cat3/src/partials/globals/header/headerDashboard.html

@@ -16,13 +16,13 @@
 				<li>
 					<div id="workzone" class="headNavigItem" ng-if="workZoneBool" ui-sref='dashboard.workzone' ui-sref-active='activeSection'>
 						<!--<a href="../../../../#ajax/Dev.html">-->
-							<i class="fa fa-credit-card"></i> WORKZONE
+							<i class="fa fa-credit-card white" ng-class="{'header-selected-item':moduleSelection.filterView.workzone}"></i> WORKZONE
 						<!--</a>-->
 					</div>
 				</li>
 				<li>
 					<div id="design" class="headNavigItem" ng-if="designBool" ui-sref='dashboard.design' ui-sref-active='activeSection'>
-							<i class="fa fa-puzzle-piece white"></i> DESIGN
+							<i class="fa fa-puzzle-piece white" ng-class="{'header-selected-item':moduleSelection.filterView.design}"></i> DESIGN
 						</a>
 					</div>
 				</li>
@@ -40,7 +40,7 @@
 				</li>
 				<li>
 					<div id="service" class="headNavigItem" ng-if="serviceBool" ui-sref='dashboard.bots' ui-sref-active='activeSection'>
-						<i class="fa fa-delicious white"></i> BOTS
+						<i class="fa fa-delicious white" ng-class="{'header-selected-item':moduleSelection.filterView.bots}"></i> BOTS
 					</div>
 				</li>
 				<li class="header-right">

client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js

@@ -13,7 +13,7 @@
 			url: "/library",
 			templateUrl: "src/partials/sections/dashboard/bots/view/library.html",
 			controller: "libraryCtrl as libr",
-			params:{filterView:{library:true}},
+			parameters:{filterView:{library:true}},
 			resolve: {
 				auth: ["$q", function ($q) {
 					var deferred = $q.defer();
@@ -31,7 +31,7 @@
 			url: "/audittrail",
 			templateUrl: "src/partials/sections/dashboard/bots/view/audittrail.html",
 			controller: "audittrailCtrl as audit",
-			params:{filterView:{audittrail:true}},
+			parameters:{filterView:{audittrail:true}},
 			resolve: {
 				auth: ["$q", function ($q) {
 					var deferred = $q.defer();
@@ -49,6 +49,8 @@
 	}])
 	.controller('botsCtrl',['$scope', '$rootScope', '$state', function ($scope, $rootScope, $state) {
 		$state.go('dashboard.bots.library');
-		$rootScope.stateItems = $state.params;
+		$scope.$watch(function() {
+			$rootScope.stateItems = $state.current.name;
+		});
 	}]);
 })(angular);

client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js

@@ -10,7 +10,7 @@
     angular.module('dashboard.bots')
     .controller('audittrailCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal', 
     function ($scope, $rootScope, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal) {
-        var treeNames = ['Bots','Audit Trail'];
+        var treeNames = ['BOTs','Audit Trail'];
         $rootScope.$emit('treeNameUpdate', treeNames);
         var audit=this;
         audit.gridOptions={
@@ -30,11 +30,11 @@
                     '<img src="images/orchestration/jenkins.png" ng-show="row.entity.auditTrailConfig.executionType==\'jenkins\'" alt="row.entity.taskType" title="Jenkins" class="task-type-img" />'+
                     '<img src="images/orchestration/script.jpg" ng-show="row.entity.auditTrailConfig.executionType==\'script\'" alt="row.entity.auditTrailConfig.executionType" title="Script" class="task-type-img" />'+
                     '<img src="images/devops-roles/devopsRole1.png" ng-show="row.entity.action==\'BOTs Blueprint Execution\'" alt="row.entity.botType" title="Blueprint" class="task-type-img" />',cellTooltip: true},
-                { name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name'},
+                { name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name',cellTooltip: true},
                 { name: 'Status',field:'status',
-                  cellTemplate:'<img class="bot-status-icon" src="images/instance-states/aws-started.png" ng-show="row.entity.status === \'success\'" title="{{row.entity.status}}">' +
-                  '<img class="bot-status-icon" src="images/instance-states/aws-stopped.png" ng-show="row.entity.status === \'failed\'" title="{{row.entity.status}}">' + 
-                  '<img class="bot-status-icon" src="images/instance-states/aws-inactive.png" ng-show="row.entity.status === \'running\'" title="{{row.entity.status}}">',
+                  cellTemplate:'<img class="bots-status-icon" src="images/instance-states/aws-started.png" ng-show="row.entity.status === \'success\'" title="{{row.entity.status}}">' +
+                  '<img class="bots-status-icon" src="images/instance-states/aws-stopped.png" ng-show="row.entity.status === \'failed\'" title="{{row.entity.status}}">' + 
+                  '<img class="bots-status-icon" src="images/instance-states/aws-inactive.png" ng-show="row.entity.status === \'running\'" title="{{row.entity.status}}">',
                   cellTooltip: true},
                 { name: 'Org',field:'masterDetails.orgName'},
                 { name: 'BU',field:'masterDetails.bgName'},

client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js

@@ -9,7 +9,7 @@
     "use strict";
     angular.module('dashboard.bots')
     .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils, $modal) {
-        var treeNames = ['Bots','Library'];
+        var treeNames = ['BOTs','Library'];
         $rootScope.$emit('treeNameUpdate', treeNames);
         var lib=this;
         $scope.totalBotsSelected = true;
@@ -25,16 +25,18 @@
                     '<img src="images/orchestration/jenkins.png" ng-show="row.entity.taskType==\'jenkins\'" alt="row.entity.taskType" title="Jenkins" class="task-type-img" />'+
                     '<img src="images/orchestration/script.jpg" ng-show="row.entity.taskType==\'script\'" alt="row.entity.taskType" title="Script" class="task-type-img" />'+
                     '<img src="images/devops-roles/devopsRole1.png" ng-show="row.entity.blueprintType" alt="row.entity.botType" title="Blueprint" class="task-type-img" />',cellTooltip: true},
-                { name: 'BOT Type',displayName: 'BOT Type',field:'botType'},
-                { name: 'BOT Name',displayName: 'BOT Name',field:'name'},
-                { name: 'Category',field:'botCategory'},
-                { name: 'description',field:'shortDesc'},
+                { name: 'BOT Type',displayName: 'BOT Type',field:'botType',cellTooltip: true},
+                { name: 'BOT Name',displayName: 'BOT Name',field:'name',cellTooltip: true},
+                { name: 'Category',field:'botCategory',cellTooltip: true},
+                { name: 'description',field:'shortDesc',cellTooltip: true},
                 { name: 'Total Runs',field:'executionCount'},
                 { name: 'BOT History',displayName: 'BOT History',cellTemplate:'<span ng-show="row.entity.blueprintType">NA</span>'+
                     '<span class="btn cat-btn-update control-panel-button" title="History" ng-show="row.entity.taskType" ng-click="grid.appScope.botLogs(row.entity);"><i class="fa fa-header white"></i></span>'},
                 { name: 'BOT Info',displayName: 'BOT Info',cellTemplate:
                     '<span class="btn cat-btn-update control-panel-button" title="Info" ng-click="grid.appScope.botInfo(row.entity);"><i class="fa fa-info white"></i></span>'},
-                { name: 'BOT Action',displayName: 'BOT Action',cellTemplate:'<span class="btn cat-btn-update control-panel-button" title="Execute" ng-click="grid.appScope.launchInstance(row.entity);"><i class="fa fa-play white"></i></span>' +
+                { name: 'BOT Action',displayName: 'BOT Action',cellTemplate:
+                    '<span class="btn cat-btn-update control-panel-button" title="Schedule" ng-click="grid.appScope.botSchedule(row.entity);"><i class="fa fa-calendar white"></i></span>' +
+                    '<span class="btn cat-btn-update control-panel-button" title="Execute" ng-click="grid.appScope.launchInstance(row.entity);"><i class="fa fa-play white"></i></span>' +
                     '<span class="btn btn-danger control-panel-button" title="Delete Task" ng-show="row.entity.taskType" ng-click="grid.appScope.deleteBotTask(row.entity);"><i class="fa fa-trash-o white"></i></span>' + 
                     '<span class="btn btn-danger control-panel-button" title="Delete Blueprint" ng-show="row.entity.blueprintType" ng-click="grid.appScope.deleteBotBP(row.entity);"><i class="fa fa-trash-o white"></i></span>'
                 }
@@ -72,13 +74,53 @@
                 console.log('Modal Dismissed at ' + new Date());
             });
         };
+        $scope.botSchedule = function() {
+            $modal.open({
+                templateUrl: 'src/partials/sections/dashboard/bots/view/botSchedule.html',
+                controller: 'botScheduleCtrl',
+                backdrop: 'static',
+                keyboard: false,
+                resolve: {
+                    items: function () {
+                        return {
+                            chefJenkScriptTaskObj:$scope.chefJenkScriptTaskObj,
+                            type:$scope.type
+                        }
+                    }
+                }
+            }).result.then(function (chefEventDetails) {
+                $scope.isEventAvailable = true;
+                $scope.chefJenkScriptTaskObj = chefEventDetails;
+                var startTimeMinute,startTimeHour,dayOfWeek,selectedDayOfTheMonth,selectedMonth;
+                startTimeMinute = $scope.chefJenkScriptTaskObj.startTimeMinute;
+                startTimeHour = $scope.chefJenkScriptTaskObj.startTime;
+                dayOfWeek = $scope.chefJenkScriptTaskObj.dayOfWeek;
+                selectedDayOfTheMonth = $scope.chefJenkScriptTaskObj.selectedDayOfTheMonth;
+                selectedMonth = $scope.chefJenkScriptTaskObj.monthOfYear;
+                $scope.type = 'edit';
+                $scope._isEventSelected = true;
+
+                $scope.repeatPattern = 'Repeat Every -' +  $scope.chefJenkScriptTaskObj.repeats;   
+                $scope.cronDetails = {
+                    cronStartOn : $scope.chefJenkScriptTaskObj.cronStart,
+                    cronEndOn : $scope.chefJenkScriptTaskObj.cronEnd,
+                    cronRepeatEvery : $scope.chefJenkScriptTaskObj.repeatBy,
+                    cronFrequency: $scope.chefJenkScriptTaskObj.repeats,
+                    cronTime: typeof startTimeHour !=='undefined'? startTimeHour : new Date().getHours() + ':' + typeof startTimeMinute !=='undefined'? startTimeMinute:new Date().getMinutes(),
+                    cronDays: $scope.chefJenkScriptTaskObj.dayOfWeek,
+                    cronMonth: $scope.chefJenkScriptTaskObj.monthOfYear
+                }
+            }, function () {
+                console.log('Dismiss time is ' + new Date());
+            });
+        };
         $scope.deleteBotTask = function(task) {
             var modalOptions = {
                 closeButtonText: 'Cancel',
                 actionButtonText: 'Delete',
                 actionButtonStyle: 'cat-btn-delete',
                 headerText: 'Delete Bot',
-                bodyText: 'Are you sure you want to delete this bot?'
+                bodyText: 'Are you sure you want to delete this bots?'
             };
             confirmbox.showModal({}, modalOptions).then(function() {
                 var param={
@@ -109,7 +151,7 @@
                 actionButtonText: 'Delete',
                 actionButtonStyle: 'cat-btn-delete',
                 headerText: 'Delete Bot',
-                bodyText: 'Are you sure you want to delete this bot?'
+                bodyText: 'Are you sure you want to delete this bots?'
             };
             confirmbox.showModal({}, modalOptions).then(function() {
                 var param={
@@ -178,7 +220,7 @@
         lib.summary = function() {
             $scope.botSummary=[];
             var param={
-                url:'/audit-trail/bot-summary'
+                url:'/audit-trail/bots-summary'
             };
             genSevs.promiseGet(param).then(function (response) {
                 $scope.botSummary = response;
@@ -215,5 +257,92 @@
         $scope.cancel= function() {
             $modalInstance.dismiss('cancel');
         };
+    }]).controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) {
+        console.log(items);
+        $scope.defaultSelection = function() {
+            $scope.repeatsType = 'Minutes';//default selection.
+            $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY');
+            $scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY');
+        };
+        if(items.type !== 'new'){
+            if(items.chefJenkScriptTaskObj !==undefined){
+                if(items.chefJenkScriptTaskObj.cronStartOn && items.chefJenkScriptTaskObj.cronEndOn) {
+                    var newStartOn = parseInt(items.chefJenkScriptTaskObj.cronStartOn);
+                    var newDate = new Date(newStartOn).toLocaleDateString();
+                    var datearray = newDate.split("/");
+                    var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2];
+                    $scope.schedulerStartOn = newdate;
+                    var newEndOn = parseInt(items.chefJenkScriptTaskObj.cronEndOn);
+                    var newEndData = new Date(newEndOn).toLocaleDateString();   
+                    var datearrayNew = newEndData.split("/");
+                    var newdateEnd = datearrayNew[1] + '/' + datearrayNew[0] + '/' + datearrayNew[2];
+                    $scope.schedulerEndOn = newdateEnd;
+                } else {
+                    $scope.schedulerStartOn = items.chefJenkScriptTaskObj.cronStart;
+                    $scope.schedulerEndOn = items.chefJenkScriptTaskObj.cronEnd;    
+                }
+
+                $scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy || items.chefJenkScriptTaskObj.cronRepeatEvery.toString();
+                $scope.repeatsType = items.chefJenkScriptTaskObj.repeats || items.chefJenkScriptTaskObj.cronFrequency;
+                $scope.timeEventType = items.chefJenkScriptTaskObj.startTime;
+                $scope.timeEventMinute = items.chefJenkScriptTaskObj.startTimeMinute;
+                $scope.weekOfTheDay = items.chefJenkScriptTaskObj.dayOfWeek;
+                $scope.currentDate = items.chefJenkScriptTaskObj.startDate;
+                $scope.selectedDayOfTheMonth = items.chefJenkScriptTaskObj.selectedDayOfTheMonth;
+                $scope.selectedMonth = items.chefJenkScriptTaskObj.monthOfYear;
+            } else {
+                $scope.defaultSelection();
+            }
+        } else {
+            $scope.defaultSelection();
+        }
+
+        $scope.dateChange= function () {
+            var startDate =  Date.parse($scope.schedulerStartOn);
+            var endDate =  Date.parse($scope.schedulerEndOn);
+            if(startDate > endDate){
+                $scope.validDateRange=true;
+            } else {
+                $scope.validDateRange=false;
+            }
+
+        };
+
+        $scope.repeatCount = function(max, step) {
+            step = step || 1;
+            var input = [];
+            for (var i = 1; i <= max; i += step) {
+                input.push(i);
+            }
+            return input;
+        };
+        $scope.isDaySelected = {
+            flag:true
+        }
+
+        $scope.daysOfWeek = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ];
+
+        $scope.monthOfYear = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ];
+        $scope.cancel = function() {
+            $modalInstance.dismiss('cancel');
+        };
+        $scope.ok=function(){
+            $scope.eventParams = {
+                repeats: $scope.repeatsType,
+                repeatBy: $scope.repeatBy,
+                cronStart: $scope.schedulerStartOn,
+                cronEnd: $scope.schedulerEndOn,
+                startTime: $scope.timeEventType,
+                startTimeMinute: $scope.timeEventMinute,
+                dayOfWeek: $scope.weekOfTheDay,
+                selectedDayOfTheMonth: $scope.selectedDayOfTheMonth,
+                monthOfYear: $scope.selectedMonth
+            };
+            $modalInstance.close($scope.eventParams);
+        };
+
+        $scope.cancel = function() {
+            $modalInstance.dismiss('cancel');
+        };
     }]);
 })(angular);