Skip to content

Changes for task scheduler #993

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 1 commit into from
Nov 29, 2016
Merged

Changes for task scheduler #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 24 additions & 6 deletions ...cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,24 @@
.controller('addChefJobEventCtrl',['$scope', '$modalInstance', 'items' ,'toastr',function($scope, $modalInstance , items , toastr){
console.log(items);
if(items.type !== 'new'){
$scope.schedulerStartOn = items.chefJenkScriptTaskObj.cronStart;
$scope.schedulerEndOn = items.chefJenkScriptTaskObj.cronEnd;
$scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy;
$scope.repeatsType = items.chefJenkScriptTaskObj.repeats;
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;
Expand All @@ -27,14 +41,18 @@
$scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY');
}


$scope.dateChange= function () {
var startDate = Date.parse($scope.schedulerStartOn);
var endDate = Date.parse($scope.schedulerEndOn);
var startDate = Date.parse($scope.schedulerStartOn);
var endDate = Date.parse($scope.schedulerEndOn);
if(startDate > endDate){
$scope.validDateRange=true;
} else {
$scope.validDateRange=false;
}
if(startDate = endDate){
$scope.validDateRange=true;
}
};

$scope.repeatCount = function(max, step) {
Expand Down
13 changes: 4 additions & 9 deletions client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,12 +416,7 @@
$scope.taskSaving = false;
return false;
}
if (!taskJSON.nodeIds.length) {
$scope.inputValidationMsg='Please select a node';
$scope.taskSaving = false;
return false;
}


for (var k = 0; k < $scope.scriptTaskList.length; k++) {
if ($scope.scriptTaskList[k]._isScriptSelected) {
var scriptId = $scope.scriptTaskList[k]._id;
Expand Down Expand Up @@ -700,13 +695,13 @@
$scope.isExecution.flag = items.taskConfig.executionOrder;
}
if(items.taskType === "chef" || items.taskType === "jenkins" || items.taskType === "script") {
if(items.cron){
$scope._isEventSelected = items.isScheduled;
//if(items.taskScheduler){
$scope._isEventSelected = items.isTaskScheduled;
$scope.showAddTask = true;
$scope.isEventAvailable = true;
$scope.chefJenkScriptTaskObj = items.taskScheduler;
$scope.type = 'edit';
}
//}
}
}
}
Expand Down