Repository: airavata-php-gateway Updated Branches: refs/heads/develop b856e8c11 -> 14fbad604
WIP Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/14fbad60 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/14fbad60 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/14fbad60 Branch: refs/heads/develop Commit: 14fbad604c25f2aa7d1e338afbc2414b3e05089b Parents: b856e8c Author: scnakandala <[email protected]> Authored: Mon May 22 15:37:06 2017 -0400 Committer: scnakandala <[email protected]> Committed: Mon May 22 15:37:06 2017 -0400 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 46 +------------------- .../partials/experiment-queue-block.blade.php | 28 ++++++++++-- 2 files changed, 27 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/14fbad60/app/controllers/ExperimentController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php index 0ffaf80..24ef1e0 100755 --- a/app/controllers/ExperimentController.php +++ b/app/controllers/ExperimentController.php @@ -464,38 +464,6 @@ class ExperimentController extends BaseController $cpusPerNode = 0; $queueName = Config::get('pga_config.airavata')["queue-name"]; -// $crResource = CRUtilities::get_compute_resource($computeResourceId); -// $cpusPerNode = $crResource->cpusPerNode; -// if($crResource->defaultNodeCount > 0){ -// $nodeCount = $crResource->defaultNodeCount; -// } -// if($crResource->defaultCPUCount > 0){ -// $cpuCount = $crResource->defaultCPUCount; -// } -// if($crResource->defaultWalltime > 0){ -// $wallTimeLimit = $crResource->defaultWalltime; -// } - -// $correctAppDeployment = null; -// foreach($appDeployments as $appDeployment){ -// if($appDeployment->computeHostId == $computeResourceId && $appDeployment->appModuleId == $appId){ -// $correctAppDeployment = $appDeployment; -// break; -// } -// } -// -// if($correctAppDeployment != null){ -// if($correctAppDeployment->defaultNodeCount > 0){ -// $nodeCount = $correctAppDeployment->defaultNodeCount; -// } -// if($correctAppDeployment->defaultCPUCount > 0){ -// $cpuCount = $correctAppDeployment->defaultCPUCount; -// } -// if($correctAppDeployment->defaultWalltime > 0) { -// $wallTimeLimit = $correctAppDeployment->defaultWalltime; -// } -// } - $queues = ExperimentUtilities::getQueueDatafromResourceId($computeResourceId); $userComputeResourcePreferences = URPUtilities::get_all_user_compute_resource_prefs(); @@ -508,17 +476,6 @@ class ExperimentController extends BaseController foreach($queues as $aQueue){ if($aQueue->isDefaultQueue){ $queueName = $aQueue->queueName; - if($aQueue->defaultNodeCount > 0){ - $nodeCount = $aQueue->defaultNodeCount; - } - if($aQueue->defaultCPUCount > 0){ - $cpuCount = $aQueue->defaultCPUCount; - } - if($aQueue->defaultWalltime > 0){ - $wallTimeLimit = $aQueue->defaultWalltime; - }if($aQueue->cpuPerNode > 0){ - $cpusPerNode = $aQueue->cpuPerNode; - } break; } } @@ -527,7 +484,8 @@ class ExperimentController extends BaseController $queueDefaults = array("queueName" => $queueName, "nodeCount" => $nodeCount, "cpuCount" => $cpuCount, - "wallTimeLimit" => $wallTimeLimit + "wallTimeLimit" => $wallTimeLimit, + "cpusPerNode" => $cpusPerNode ); return View::make("partials/experiment-queue-block", array("queues" => $queues, "queueDefaults" => $queueDefaults, http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/14fbad60/app/views/partials/experiment-queue-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/experiment-queue-block.blade.php b/app/views/partials/experiment-queue-block.blade.php index 1bdd290..6ab967f 100644 --- a/app/views/partials/experiment-queue-block.blade.php +++ b/app/views/partials/experiment-queue-block.blade.php @@ -8,6 +8,7 @@ </div> @endif <input type="hidden" id="queue-array" value="{{ htmlentities( json_encode( $queues ) ) }}"/> +<input type="hidden" id="queue-defaults-array" value="{{ htmlentities( json_encode( $queueDefaults ) ) }}"/> <div class="form-group required"> @if( count( $queues) > 0 ) <label class="control-label" for="node-count">Select a Queue</label> @@ -156,6 +157,7 @@ function getQueueData(selectedQueue) { var queues = $.parseJSON($("#queue-array").val()); + var queueDefaults = $.parseJSON($("#queue-defaults-array").val()); var veryLargeValue = 9999999; console.log(queues); $(".queue-view").addClass("hide"); @@ -174,7 +176,11 @@ else $(".node-count").parent().addClass("hide"); - $("#node-count").html(queues[i]['defaultNodeCount']); + if(queues[i]['defaultNodeCount'] > 0){ + $("#node-count").val(queues[i]['defaultNodeCount']); + }else{ + $("#node-count").val(queueDefaults['nodeCount']); + } //core-count if (queues[i]['maxProcessors'] != 0 && queues[i]['maxProcessors'] != null) { @@ -189,7 +195,12 @@ else $(".cpu-count").parent().addClass("hide"); - $("#cpu-count").html(queues[i]['defaultCPUCount']); + if(queues[i]['defaultCPUCount'] > 0){ + $("#cpu-count").val(queues[i]['defaultCPUCount']); + }else{ + $("#cpu-count").val(queueDefaults['cpuCount']); + } + //walltime-count if (queues[i]['maxRunTime'] != null && queues[i]['maxRunTime'] != 0) { @@ -204,7 +215,18 @@ else $(".walltime-count").parent().addClass("hide"); - $("#walltime-count").html(queues[i]['defaultWalltime']); + if(queues[i]['defaultWalltime'] > 0) { + $("#walltime-count").val(queues[i]['defaultWalltime']); + }else{ + $("#walltime-count").val(queueDefaults['wallTimeLimit']); + } + + if(queues[i]['cpusPerNode'] > 0){ + var cpusPerNode = queues[i]['cpusPerNode']; + }else{ + var cpusPerNode = queueDefaults['cpusPerNode']; + } + //memory-count if (queues[i]['maxMemory'] != 0 && queues[i]['maxMemory'] != null) {
