Skip to content

Added schedule , start, stop, function for instance #867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 2, 2016
Merged

Added schedule , start, stop, function for instance #867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16c63fb
Added schedule , start, stop, function for instance
Oct 28, 2016
5fa553a
Added schedule , start, stop, function for instance
Oct 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/cat3/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
<script src="src/partials/globals/ui-gridOptions/uiGridOptionsServices.js"></script>
<script src="src/partials/sections/dashboard/dashboardCtrl.js"></script>
<script src="src/partials/sections/dashboard/genericServices.js"></script>
<script src="src/partials/sections/dashboard/popups/controller/scheduleCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/analytics.js"></script>
<script src="src/partials/sections/dashboard/analytics/analyticsServices.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/costCtrl.js"></script>
Expand Down
3 changes: 2 additions & 1 deletion client/cat3/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr',
'ui.grid.autoResize','ui.grid.exporter',
'ui.grid.resizeColumns',
'global.uiGridOptions',
'global.messages'
'global.messages',
'ui.grid.selection'
]);

angularApp.run(['$rootScope', 'auth', '$state', '$stateParams','$http','$window',
Expand Down
32 changes: 15 additions & 17 deletions client/cat3/src/partials/sections/dashboard/genericServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,27 +255,25 @@

});
};
/*genericServices.editRunlist = function(chefRunlist, chefAttribute) {
genericServices.scheduleTime=function (ids) {
$modal.open({
templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationUpdateChefRunlist.html',
controller: 'orchestrationUpdateChefRunlistCtrl',
animate: true,
templateUrl: "src/partials/sections/dashboard/popups/view/schedule.html",
controller: "scheduleCtrl as sch",
backdrop: 'static',
keyboard: false,
resolve : {
cookbookRunlistAttr: function(){
return {
chefrunlist: chefRunlist,
attributes: chefAttribute
};
resolve: {
items: function() {
return ids;
}
}
}).result.then(function (selectedCookBooks) {
//$rootScope.editRunListAttributes = false;
// $rootScope.chefrunlist = selectedCookBooks.list;
// $rootScope.cookbookAttributes = selectedCookBooks.cbAttributes;
}, function () {
console.log('Dismiss time is ' + new Date());
});
};*/
})
};
genericServices.instanceStart=function (ids) {

};
genericServices.instanceStop=function () {

};
}]);
})(angular);
19 changes: 19 additions & 0 deletions client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
(function(){
"use strict";
angular.module('dashboard')
.controller('scheduleCtrl', ['$scope', '$modalInstance', 'items','$filter',function($scope, $modalInstance, items,$filter) {
var sch=this;
sch.schedule={
repeat:'Daily',
repeatTimes:'1',
startsOn:new Date(),
ends:'Never'
}
sch.cancel = function() {
$modalInstance.dismiss('cancel');
};
sch.ok=function(){

};
}]);
})();
61 changes: 61 additions & 0 deletions client/cat3/src/partials/sections/dashboard/popups/view/schedule.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<div id='addJenkinsParamsPage'>
<form name="scheduleForm" novalidate>
<div class="modal-header">
<span class="close" ng-click="sch.cancel()">×</span>
<h4 class="modal-title"><i class="fa fa-calendar"></i> Manage Schedule</h4>
</div>

<div class="modal-body">

<div class="col-lg-6 col-md-6 margintop15">
<label>Starts on: <span class="red">*</span>
</label>
<input required type="text" ng-model="sch.schedule.startsOn" class="form-control" >
</div>
<div class="col-lg-6 col-md-6 margintop15">
<label>Ends:
</label>
<input type="text" ng-model="sch.schedule.ends" class="form-control" >
</div>
<div class="col-lg-6 col-md-6 margintop15">
<label>Repeats: <span class="red">*</span>
</label>
<select class="form-control" ng-model="sch.schedule.repeat" required>
<option value="Daily" title="Hourly">Hourly</option>
<option value="Daily" title="Daily">Daily</option>
<option value="Weekly" title="Weekly">Weekly</option>
<option value="Monthly" title="Monthly">Monthly</option>
<option value="Yearly" title="Yearly">Yearly</option>
</select>
</div>
<div class="col-lg-6 col-md-6 margintop15">
<label>Repeat every: <span class="red">*</span>
</label>
<select class="form-control" ng-model="sch.schedule.repeatTimes" required>
<option value="1" selected="selected" title="Daily">1</option>
<option value="2" title="Daily">2</option>
<option value="3" title="Daily">3</option>
<option value="4" title="Daily">4</option>
<option value="5" title="Daily">5</option>
<option value="6" title="Daily">6</option>
<option value="7" title="Daily">7</option>
<option value="8" title="Daily">8</option>
<option value="9" title="Daily">9</option>
<option value="10" title="Daily">10</option>
</select>
</div>


<div class="clearfix"></div>
</div>

<div class="modal-footer">
<button type="button" class="btn cat-btn-close" ng-click="sch.cancel()">
<i class="fa fa-times black"></i> Cancel
</button>
<button type="button" class="btn cat-btn-update" ng-disabled="scheduleForm.$invalid" ng-click="sch.ok()">
<i class="fa fa-check white"></i> Save
</button>
</div>
</form>
</div>
15 changes: 13 additions & 2 deletions client/cat3/src/partials/sections/dashboard/workzone/instance/instance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@
</button>
</span>
<span class="pull-right">
<span ng-show="selectedInstanceId.length >0">
<button type="button" title="Schedule" class="btn btn-xs cat-btn-update" ng-click="scheduleInt()">
<i class="fa fa-calendar white"></i>
</button>
<button type="button" title="Stope" class="btn btn-xs cat-btn-update" ng-click="instanceStop()">
Stop
</button>
<button type="button" title="Start" class="btn btn-xs cat-btn-update" ng-click="instanceStart()">
Start
</button>
</span>
<span ng-if="filterBy">
<span ng-repeat="chip in filterChips" class="chip"><strong>{{chip.key}}:&nbsp;</strong>{{chip.value}}</span>
<span class="chip"><i class="fa fa-fw fa-close black cursor" ng-click="resetFilter()"></i></span>
Expand Down Expand Up @@ -103,7 +114,7 @@ <h3 class="box-title"><i class="fa fa-fw fa-filter"></i>Filter By</h3>

<section id="cardView" class="scrollContent" ng-show="isCardViewActive">
<div class="card-wrapper" ng-repeat="inst in instanceList" ng-mouseover="overHandler()" ng-mouseout="outHandler()">
<div class="card" ng-click="selectCard(inst._id);" ng-class="{'card-border' :inst._id == selectedCard}">
<div class="card" ng-click="selectCard(inst._id);" ng-class="{'card-border' :selectedInstanceId.indexOf(inst._id) !== -1}">
<div class="card-title">
<div class="card-title-role">
<img class="instanceRoleLogo" ng-src="{{getRoleLogo(inst)}}" />
Expand Down Expand Up @@ -242,7 +253,7 @@ <h3 class="box-title"><i class="fa fa-fw fa-filter"></i>Filter By</h3>
<section id="tableView" ng-show="!isCardViewActive">
<div class="instance-grid-wrapper">
<!-- <loading size="large" name="isinstancesTableLoading" type="block"></loading>-->
<div id="grid2" ng-if="tabData.length >0" ui-grid="instancesGridOptions" ui-grid-pagination ui-grid-auto-resize class="grid instance-status" style="height: {{gridHeight}}px"></div>
<div id="grid2" ng-if="tabData.length >0" ui-grid="instancesGridOptions" ui-grid-selection ui-grid-pagination ui-grid-auto-resize class="grid instance-status" style="height: {{gridHeight}}px"></div>
</div>
</section>
</div>
Expand Down
42 changes: 39 additions & 3 deletions client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"use strict";
angular.module('workzone.instance', ['ui.bootstrap', 'utility.validation', 'filter.currentTime', 'apis.workzone', 'utility.array', 'workzonePermission', 'instanceServices', 'chefDataFormatter', 'utility.pagination', 'ngFileUpload'])
.controller('instanceCtrl', ['chefSelectorComponent', '$scope', '$rootScope', '$modal', '$q', 'workzoneServices', 'arrayUtil', 'instancePermission',
'instanceActions', 'instanceOperations', 'workzoneEnvironment', '$timeout', 'workzoneUIUtils', 'uiGridOptionsService', 'confirmbox',
function(chefSelectorComponent, $scope, $rootScope, $modal, $q, workzoneServices, arrayUtil, instancePerms, instanceActions, instanceOperations, workzoneEnvironment, $timeout, workzoneUIUtils, uiGridOptionsService, confirmbox) {
'instanceActions', 'instanceOperations', 'workzoneEnvironment', '$timeout', 'workzoneUIUtils', 'uiGridOptionsService', 'confirmbox','genericServices',
function(chefSelectorComponent, $scope, $rootScope, $modal, $q, workzoneServices, arrayUtil, instancePerms, instanceActions, instanceOperations, workzoneEnvironment, $timeout, workzoneUIUtils, uiGridOptionsService, confirmbox,genericServices) {
var helper = {
attachListOfTaskWithInstance: function(completeData) {
var instanceList = completeData.instances;
Expand Down Expand Up @@ -73,6 +73,7 @@
}
}
};
$scope.selectedInstanceId=[];
$scope.instancePageLevelLoader = true;
$scope.instStartStopFlag = false;
$scope.isImportClickEnabled = true;
Expand All @@ -91,7 +92,15 @@
$scope.filterChips = [];
$scope.providerLoading = false;
$scope.regionLoading = false;

$scope.scheduleInt = function(){
genericServices.scheduleTime($scope.selectedInstanceId);
};
$scope.instanceStop=function () {
genericServices.instanceStop($scope.selectedInstanceId);
};
$scope.instanceStart=function () {
genericServices.instanceStart($scope.selectedInstanceId);
};
$scope.openContainersTab = function() {
$scope.$parent.$parent.activateTab('Containers');
};
Expand All @@ -112,6 +121,9 @@
$scope.isInstancePageLoading = true;
var gridBottomSpace = 5;
var instanceUIGridDefaults = uiGridOptionsService.options();
angular.extend(instanceUIGridDefaults.gridOption, {enableRowSelection: true,
enableSelectAll: true,
selectionRowHeaderWidth: 35,multiSelect:true,enableRowHeaderSelection: true});
$scope.paginationParams = instanceUIGridDefaults.pagination;
$scope.currentCardPage = instanceUIGridDefaults.pagination.page;
$scope.cardsPerPage = instanceUIGridDefaults.pagination.pageSize;
Expand Down Expand Up @@ -180,7 +192,23 @@
$scope.instancesGridOptions = angular.extend(instanceUIGridDefaults.gridOption, {
onRegisterApi: function(gridApi) {
$scope.gridApi = gridApi;
gridApi.selection.on.rowSelectionChanged($scope,function(row){
if(row.isSelected){
$scope.selectedInstanceId.push(row.entity._id);
} else {
$scope.selectedInstanceId.splice(row.entity._id,1);
}

});
gridApi.selection.on.rowSelectionChangedBatch($scope,function(rows){
angular.forEach(rows,function(row){
if(row.isSelected){
$scope.selectedInstanceId.push(row.entity._id);
} else {
$scope.selectedInstanceId.splice(row.entity._id,1);
}
});
});
//Sorting for sortBy and sortOrder
gridApi.core.on.sortChanged($scope, function(grid, sortColumns) {
if (sortColumns[0] && sortColumns[0].field && sortColumns[0].sort && sortColumns[0].sort.direction) {
Expand Down Expand Up @@ -545,8 +573,15 @@
};
$scope.selectCard = function(identi) {
$scope.selectedCard = identi;
console.log($scope.selectedInstanceId.indexOf(identi));
if($scope.selectedInstanceId.indexOf(identi) === -1){
$scope.selectedInstanceId.push(identi);
} else {
$scope.selectedInstanceId.splice($scope.selectedInstanceId.indexOf(identi),1);
}
};
$scope.setCardView = function() {
$scope.selectedInstanceId=[];
$scope.isCardViewActive = true;
$scope.instanceCardViewSelection = "instance-tab-active";
$scope.instanceTableViewSelection = "";
Expand Down Expand Up @@ -581,6 +616,7 @@
});
};
$scope.instanceTableView = function() {
$scope.selectedInstanceId=[];
$scope.isCardViewActive = false;
$scope.instanceTableViewSelection = "instance-tab-active";
$scope.instanceCardViewSelection = "";
Expand Down