You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/07/19 20:05:13 UTC
[airavata-django-portal] branch master updated (b641e02 -> 83f1010)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from b641e02 Removing unused import
new ab025a2 Clicking queue settings card toggles queue settings form
new 83f1010 Labeled wall time limit with units
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../components/experiment/QueueSettingsEditor.vue | 88 ++++++++++------------
1 file changed, 38 insertions(+), 50 deletions(-)
[airavata-django-portal] 01/02: Clicking queue settings card
toggles queue settings form
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit ab025a21a9bdc3a02240e0401e4928beee436ac3
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jul 19 16:01:14 2019 -0400
Clicking queue settings card toggles queue settings form
---
.../components/experiment/QueueSettingsEditor.vue | 84 ++++++++++------------
1 file changed, 36 insertions(+), 48 deletions(-)
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
index 4d9deca..2242bd2 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
@@ -3,39 +3,32 @@
<div>
<div class="row">
<div class="col">
- <div class="card border-default" :class="{ 'border-danger': !valid }">
- <div class="card-body">
- <h5 class="card-title mb-4">Settings for queue {{ localComputationalResourceScheduling.queueName }}</h5>
- <div class="row">
- <div class="col">
- <h3 class="h5 mb-0">{{ localComputationalResourceScheduling.nodeCount }}</h3>
- <span class="text-muted text-uppercase">NODE COUNT</span>
- </div>
- <div class="col">
- <h3 class="h5 mb-0">{{ localComputationalResourceScheduling.totalCPUCount }}</h3>
- <span class="text-muted text-uppercase">CORE COUNT</span>
- </div>
- <div class="col">
- <h3 class="h5 mb-0">{{ localComputationalResourceScheduling.wallTimeLimit }}</h3>
- <span class="text-muted text-uppercase">TIME LIMIT</span>
+ <div
+ class="card border-default"
+ :class="{ 'border-danger': !valid }"
+ >
+ <b-link
+ @click="showConfiguration = !showConfiguration"
+ class="card-link text-dark"
+ >
+ <div class="card-body">
+ <h5 class="card-title mb-4">Settings for queue {{ localComputationalResourceScheduling.queueName }}</h5>
+ <div class="row">
+ <div class="col">
+ <h3 class="h5 mb-0">{{ localComputationalResourceScheduling.nodeCount }}</h3>
+ <span class="text-muted text-uppercase">NODE COUNT</span>
+ </div>
+ <div class="col">
+ <h3 class="h5 mb-0">{{ localComputationalResourceScheduling.totalCPUCount }}</h3>
+ <span class="text-muted text-uppercase">CORE COUNT</span>
+ </div>
+ <div class="col">
+ <h3 class="h5 mb-0">{{ localComputationalResourceScheduling.wallTimeLimit }}</h3>
+ <span class="text-muted text-uppercase">TIME LIMIT</span>
+ </div>
</div>
</div>
- </div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col">
- <div v-if="!showConfiguration">
- <i
- class="fa fa-cog text-secondary"
- aria-hidden="true"
- ></i>
- <a
- class="text-secondary"
- href="#"
- @click.prevent="showConfiguration = true"
- >Configure Resource</a>
+ </b-link>
</div>
</div>
</div>
@@ -136,15 +129,16 @@
</div>
</b-form-group>
<div>
- <i
- class="fa fa-times text-secondary"
- aria-hidden="true"
- ></i>
<a
- class="text-secondary"
+ class="text-secondary action-link"
href="#"
@click.prevent="showConfiguration = false"
- >Hide Settings</a>
+ >
+ <i
+ class="fa fa-times text-secondary"
+ aria-hidden="true"
+ ></i>
+ Hide Settings</a>
</div>
</div>
</div>
@@ -161,7 +155,7 @@ export default {
mixins: [mixins.VModelMixin],
props: {
value: {
- type: models.ComputationalResourceSchedulingModel,
+ type: models.ComputationalResourceSchedulingModel
},
appDeploymentId: {
type: String,
@@ -257,15 +251,9 @@ export default {
const queueDefault = this.queueDefaults.find(
queue => queue.queueName === queueName
);
- this.data.totalCPUCount = this.getDefaultCPUCount(
- queueDefault
- );
- this.data.nodeCount = this.getDefaultNodeCount(
- queueDefault
- );
- this.data.wallTimeLimit = this.getDefaultWalltime(
- queueDefault
- );
+ this.data.totalCPUCount = this.getDefaultCPUCount(queueDefault);
+ this.data.nodeCount = this.getDefaultNodeCount(queueDefault);
+ this.data.wallTimeLimit = this.getDefaultWalltime(queueDefault);
},
validate() {
if (!this.valid) {
@@ -384,7 +372,7 @@ export default {
// queue and its default values and apply them
const updateQueueSettings = !this.value.queueName;
this.loadQueueDefaults(updateQueueSettings).then(() => this.validate());
- this.$on('input', () => this.validate());
+ this.$on("input", () => this.validate());
}
};
</script>
[airavata-django-portal] 02/02: Labeled wall time limit with units
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 83f1010420a9b073f4d51b8f1c3e704d363ad7a0
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jul 19 16:04:57 2019 -0400
Labeled wall time limit with units
---
.../js/components/experiment/QueueSettingsEditor.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
index 2242bd2..b8af3e9 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
@@ -23,7 +23,7 @@
<span class="text-muted text-uppercase">CORE COUNT</span>
</div>
<div class="col">
- <h3 class="h5 mb-0">{{ localComputationalResourceScheduling.wallTimeLimit }}</h3>
+ <h3 class="h5 mb-0">{{ localComputationalResourceScheduling.wallTimeLimit }} minutes</h3>
<span class="text-muted text-uppercase">TIME LIMIT</span>
</div>
</div>
@@ -103,7 +103,7 @@
</div>
</b-form-group>
<b-form-group
- label="Wall Time Limit"
+ label="Wall Time Limit (in minutes)"
label-for="walltime-limit"
:feedback="getValidationFeedback('wallTimeLimit')"
:state="getValidationState('wallTimeLimit', true)"
@@ -125,7 +125,7 @@
class="fa fa-info-circle"
aria-hidden="true"
></i>
- Max Allowed Wall Time = {{ maxWalltime }}
+ Max Allowed Wall Time = {{ maxWalltime }} minutes
</div>
</b-form-group>
<div>