Skip to content

Commit

Permalink
Task Management Modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@suthagar23
suthagar23 committed Aug 21, 2017
1 parent 06fec0a commit 699564b
Show file tree
Hide file tree
Showing 4 changed files with 297 additions and 57 deletions.
26 changes: 17 additions & 9 deletions app/js/taskManage/addNewTask.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ <h1>{{formProperties[1]}}</h1>
</div>
</div>

<div class="alert alert-danger alert-dismissable" ng-show="!isSavedTaskDefinitions">
<div class="alert alert-danger alert-dismissable" ng-show="isValidationError">
<a class="close" data-dismiss="alert" aria-label="close">×</a>
{{validationErrorMessage}}
</div>

<div class="alert alert-success alert-dismissable" ng-show="isSavedTaskDefinitions">
<div class="alert alert-success alert-dismissable" ng-if="isValidationError==false">
<a class="close" data-dismiss="alert" aria-label="close">×</a>
Task definition saved successfully.
</div>
Expand All @@ -33,9 +33,9 @@ <h2> Task Configuration </h2>
<option value="org.openmrs.scheduler.tasks.AutoCloseVisitsTask">org.openmrs.scheduler.tasks.AutoCloseVisitsTask</option>
<option value="org.openmrs.scheduler.tasks.ProcessHL7InQueueTask">org.openmrs.scheduler.tasks.ProcessHL7InQueueTask</option>
<option value="org.openmrs.scheduler.tasks.InitializeLogicRuleProvidersTask">org.openmrs.scheduler.tasks.InitializeLogicRuleProvidersTask</option>
<option value="org.openmrs.scheduler.tasks.AlertReminderTask ">org.openmrs.scheduler.tasks.AlertReminderTask</option>
<option value="org.openmrs.scheduler.tasks.CheckInternetConnectivityTask ">org.openmrs.scheduler.tasks.CheckInternetConnectivityTask</option>
<option value="org.openmrs.scheduler.tasks.SendEmailTask ">org.openmrs.scheduler.tasks.SendEmailTask</option>
<option value="org.openmrs.scheduler.tasks.AlertReminderTask">org.openmrs.scheduler.tasks.AlertReminderTask</option>
<option value="org.openmrs.scheduler.tasks.CheckInternetConnectivityTask ">org.openmrs.scheduler.tasks.CheckInternetConnectivityTask</option>
<option value="org.openmrs.scheduler.tasks.SendEmailTask">org.openmrs.scheduler.tasks.SendEmailTask</option>
</select>
</div>
</div>
Expand All @@ -56,7 +56,15 @@ <h2> Schedule </h2>

<div class="row" style="margin-bottom:15px;">
<div class="col-2 col-xl-2 col-sm-2">Started </div>
<div class="col-9 col-xl-9 col-sm-9 form"> {{started}} </div>
<div class="col-9 col-xl-9 col-sm-9 form">
<p ng-if="started == true">
<img src="img/running-module.png" height="20" style="top: 5px;left: auto; padding-right: 15px;" /> Started
</p>
<p ng-if="started != true">
<img src="img/stopped-module.png" height="20" style="top: 5px;left: auto; padding-right: 15px;"/> Not Started
</p>

</div>
</div>

<div class="row" style="margin-bottom:15px;">
Expand Down Expand Up @@ -96,7 +104,7 @@ <h2> Schedule </h2>

<div class="panel-body">
<h2> Properties </h2>
<div class="bd-callout bd-callout-info" ng-repeat="choice in properties">
<div class="bd-callout bd-callout-info" ng-repeat="properties in taskProperties">
<h4 id="" style="margin-bottom:10px;">New Property</h4>
<div class="row" style="margin-bottom:10px;">
<div style="padding-left: 5px; padding-right: 5px; padding-top: 10px;">Name</div>
Expand All @@ -108,12 +116,12 @@ <h4 id="" style="margin-bottom:10px;">New Property</h4>
<div class="col-4 col-xl-4 col-sm-4 form">
<input type="text" placeholder="Enter property value" ng-model="properties.value" style="width:95%;" required>
</div>
<button class="btn btn-danger" ng-click="removeProperties()"><i class="icon-remove"> </i></button>
<button class="btn btn-danger" ng-click="removeTaskProperties()"><i class="icon-remove"> </i></button>
</div>

</div>

<button ng-click="addNewProperties()"><i class="icon-plus"> </i> Add New</button>
<button ng-click="addNewTaskProperties()"><i class="icon-plus"> </i> Add New</button>

</div>

Expand Down
36 changes: 23 additions & 13 deletions app/js/taskManage/addNewTaskController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ addNewTaskModule.controller('addNewTaskCtrl', ['$scope','$http','OWARoutesUtil',
$scope.startOnStartup = false;
$scope.started = false;
$scope.isAddNewTask=true;
$scope.properties = [];
$scope.addNewProperties = function() {
$scope.properties.push({});
$scope.taskProperties = [];

$scope.addNewTaskProperties = function() {
$scope.taskProperties.push({});
};

$scope.removeProperties = function() {
var lastItem = $scope.properties.length-1;
$scope.properties.splice(lastItem);
$scope.removeTaskProperties = function() {
var lastItem = $scope.taskProperties.length-1;
$scope.taskProperties.splice(lastItem);
};

$scope.initializeAddNewTask = function () {
Expand Down Expand Up @@ -47,6 +48,14 @@ addNewTaskModule.controller('addNewTaskCtrl', ['$scope','$http','OWARoutesUtil',
return newJson;
}

function convertJsonToProperties(json){
$scope.taskProperties = [];
angular.forEach(json, function(jsonValue, key) {
var newJson = {name : key, value : jsonValue};
$scope.taskProperties.push(newJson);
});
}

$scope.getTaskDetails = function(taskName){

console.log("getTaskDetails : " + taskName);
Expand All @@ -71,7 +80,7 @@ addNewTaskModule.controller('addNewTaskCtrl', ['$scope','$http','OWARoutesUtil',
$scope.startTimeVal = responseData.startTime;
$scope.repeatInterval = responseData.repeatInterval;
$scope.started = responseData.started;
// $scope.properties
convertJsonToProperties(responseData.properties);
}
else{
console.log("error");
Expand All @@ -90,13 +99,14 @@ addNewTaskModule.controller('addNewTaskCtrl', ['$scope','$http','OWARoutesUtil',
//update the task
var uploadUrl = OWARoutesUtil.getOpenmrsUrl()+"/ws/rest/v1/taskdefinition/" + $routeParams.classUUID;
}
console.log(uploadUrl);
$scope.SaveNewTaskDefinitions(uploadUrl);
}

$scope.SaveNewTaskDefinitions = function (uploadUrl) {
if(validateAddNewTaskDefinitions()){
if(typeof($scope.isSavedTaskDefinitions)!=undefined){
delete $scope.isSavedTaskDefinitions;
if(typeof($scope.isValidationError)!=undefined){
delete $scope.isValidationError;
}
if(typeof($scope.validationErrorMessage)!=undefined){
delete $scope.validationErrorMessage;
Expand All @@ -113,14 +123,14 @@ addNewTaskModule.controller('addNewTaskCtrl', ['$scope','$http','OWARoutesUtil',
"startOnStartup": $scope.startOnStartup,
"startTime": startTime,
"repeatInterval" : ''+$scope.repeatInterval,
"properties" : createPropertyJson($scope.properties)
"properties" : createPropertyJson($scope.taskProperties)
};
console.log(moduleData);
$http.post(uploadUrl, moduleData , {
headers: {
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8'}
}) .success(function (data, status, headers, config) {
$scope.isSavedTaskDefinitions = true;
$scope.isValidationError = false;
console.log("taskdefinition saved");
}).error(function (data, status, headers, config) {

Expand Down Expand Up @@ -177,11 +187,11 @@ addNewTaskModule.controller('addNewTaskCtrl', ['$scope','$http','OWARoutesUtil',
}


$scope.isSavedTaskDefinitions = false;
$scope.isValidationError = true;
});
}
else{
$scope.isSavedTaskDefinitions = false;
$scope.isValidationError = true;
//console.log("Validation Failed");
}
}
Expand Down
59 changes: 43 additions & 16 deletions app/js/taskView/taskView.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,33 @@ <h2>Manage Scheduler</h2>
</div>
</div>

<div class="alert alert-success alert-dismissable" ng-if="isDeletedTaskDefinition[0]==true">
<div class="alert alert-success alert-dismissable" ng-if="isActionStatus[0]==true">
<a class="close" data-dismiss="alert" aria-label="close">×</a>
Successfully deleted task definition[{{isDeletedTaskDefinition[1]}}]
{{isActionStatus[1]}}
</div>

<div class="alert alert-danger alert-dismissable" ng-if="isDeletedTaskDefinition[0]==false">
<div class="alert alert-danger alert-dismissable" ng-if="isActionStatus[0]==false">
<a class="close" data-dismiss="alert" aria-label="close">×</a>
Task Definition[{{isDeletedTaskDefinition[1]}}] delete failed.
{{isActionStatus[1]}}
</div>

<div class="alert alert-danger alert-dismissable" ng-if="requestAllTaskDetails==false">
<a class="close" data-dismiss="alert" aria-label="close">×</a>
Could not get the task information from the system.
</div>


<div class="row col-12">
<div class="panel-body" style="width: 100%">
<div class="panel-body" style="width: 100%" ng-show="allTasksData">

<div style="padding-bottom: 10px;">
<a href="#/add-new-task">
<button><i class="icon-plus"> </i> Add Tasks</button>
</a>
<a href="#">
<button><i class="icon-repeat"> </i> Refresh Tasks</button>
</a>
<a> <button ng-click="getAllTaskDetails()"><i class="icon-repeat"> </i> Refresh</button> </a>
<a> <button ng-click="rescheduleAllTasks()"><i class="icon-repeat"> </i> Reschedule All</button> </a>
<a> <button ng-click="shutdownAllTasks()"><i class="icon-repeat"> </i> Shutdown All</button> </a>
<a> <button ng-click="startOnStartupTasks()"><i class="icon-repeat"> </i>Start Startup Tasks</button> </a>

</div>

Expand All @@ -37,7 +44,7 @@ <h2>Manage Scheduler</h2>
<th> Task </th>
<th style="min-width: 350px;"> Schedule </th>
<th> On Startup </th>
<th style="min-width: 130px;"> Actions </th>
<th style="min-width: 160px;"> Actions </th>
</tr>

<tr ng-repeat="task in allTasksData">
Expand All @@ -60,10 +67,12 @@ <h2>Manage Scheduler</h2>
<td valign="top" ng-if="task.startOnStartup==false" style="vertical-align: middle;"><b>No</b>(manual)</td>

<td valign="top" align="center" valign="middle" style="vertical-align:middle;">
<button ng-click="stopConfirmationShow(class.packageName,class.uuid, class.display)" ng-if="task.started == true"> <img src="img/stop-new-1.png" /> </button>
<button ng-click="StartModule(class.uuid,'ALLMODULES', class.display)" ng-if="task.started != true"> <img src="img/start-new-1.png" /> </button>

<button class="btn btn-danger" ng-click="unloadConfirmationShow(task.name, task.uuid)"> <i class="icon-trash"></i></button>
<a></a><button ng-click="stopConfirmationShow(task.uuid, task.name)" style="width:160px;" ng-if="task.started == true"> <img src="img/stop-new-1.png" /> Stop</button> </a>
<a><button ng-click="startTask(task.uuid, task.name)" style="width:160px;" ng-if="task.started != true"> <img src="img/start-new-1.png" /> Start</button> </a>
<br/>
<a><button class="btn btn-danger" style="width:160px; margin-top: 5px;" ng-click="rescheduleTasks(task.uuid, task.name )"> <i class="icon-repeat"></i> Reschedule</button> </a>
<br/>
<a><button class="btn btn-danger" style="width:160px; margin-top: 5px;" ng-click="unloadConfirmationShow(task.uuid, task.name )"> <i class="icon-trash"></i> Delete</button> </a>
</td>
</tr>
</tbody>
Expand All @@ -80,14 +89,32 @@ <h2>Manage Scheduler</h2>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Do you want to delete {{uploadConfirmModuleData.name}}?</h5>
<h5 class="modal-title">Do you want to delete {{unloadConfirmModuleData.name}}?</h5>
</div>
<form>
<div class="modal-footer" >
<button class=" btn-danger" ng-click="unloadModule(uploadConfirmModuleData.uuid, uploadConfirmModuleData.name)" data-dismiss="modal"> <i class="icon-ok"></i> Yes</button>
<button class=" btn-danger" ng-click="unloadTask(unloadConfirmModuleData.uuid, unloadConfirmModuleData.name)" data-dismiss="modal"> <i class="icon-ok"></i> Yes</button>
<button class=" btn-secondary" data-dismiss="modal"><i class="icon-remove"> </i> No</button>
</div>
</form>
</div>
</div>
</div>
</div>

<div class="modal fade" id="stopConfirmation" aria-labelledby="stopConfirmation" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Do you want to stop {{stopConfirmModuleData.name}}?</h5>
</div>
<form>
<div class="modal-footer" >
<button class=" btn-danger" ng-click="stopTask(stopConfirmModuleData.uuid, stopConfirmModuleData.name)" data-dismiss="modal"> <i class="icon-ok"></i> Yes</button>
<button class=" btn-secondary" data-dismiss="modal"><i class="icon-remove"> </i> No</button>
</div>
</form>
</div>
</div>
</div>

<ng-include src="'js/common/loadingPopUp.html'"></ng-include>
Loading

0 comments on commit 699564b

Please sign in to comment.