Skip to content

Commit

Permalink
Merge pull request #6282 from deNBI/fix/modification_volume
Browse files Browse the repository at this point in the history 
fix(Wording): Modification request, volume storage
  • Loading branch information
@dweinholz
dweinholz authored Dec 10, 2024
2 parents 018df4f + 1d00e53 commit ed936b2
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/app/applications/application-formular/application-formular.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
/>
<div class="input-group-append"><span class="input-group-text"> GB </span></div>
</div>
<span class="help-block">How much total extra storage do you need for your VMs?</span>
<span class="help-block">How much total storage do you need for your VMs in form of Volumes?</span>
</div>
</div>
<div class="form-group row" *ngIf="openstack_project">
Expand Down
18 changes: 9 additions & 9 deletions src/app/projectmanagement/modals/adjust-application/adjust-application.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h4>Adjust application for {{ application?.project_application_shortname }}</h4>
[ngStyle]="{
'background-color': adjustedApplication.project_application_openstack_project
? '#FF0000'
: '#00adef'
: '#00adef',
}"
></span>
</label>
Expand Down Expand Up @@ -78,7 +78,7 @@ <h4>Adjust application for {{ application?.project_application_shortname }}</h4>
appInteger
[ngClass]="{
'is-invalid': resourceAdjustmentForm.controls.granted_lifetime_counter?.invalid,
'is-valid': resourceAdjustmentForm.controls.granted_lifetime_counter?.valid
'is-valid': resourceAdjustmentForm.controls.granted_lifetime_counter?.valid,
}"
/>
</div>
Expand Down Expand Up @@ -109,7 +109,7 @@ <h6 class="col-md-8 form-control-label">
style="font-size: 25px"
[ngClass]="{
'icon-arrow-up': groupval.isOpen,
'icon-arrow-down': !groupval.isOpen
'icon-arrow-down': !groupval.isOpen,
}"
></i>
</div>
Expand Down Expand Up @@ -163,7 +163,7 @@ <h6 class="col-md-8 form-control-label">
appIntegerOrNull
[ngClass]="{
'is-invalid': name?.invalid,
'is-valid': name?.valid
'is-valid': name?.valid,
}"
/>
<div class="input-group-append"><span class="input-group-text"> VMs</span></div>
Expand Down Expand Up @@ -217,7 +217,7 @@ <h6 class="col-md-8 form-control-label">
appInteger
[ngClass]="{
'is-invalid': resourceAdjustmentForm.controls.granted_volume_counter?.invalid,
'is-valid': resourceAdjustmentForm.controls.grated_volume_counter?.valid
'is-valid': resourceAdjustmentForm.controls.grated_volume_counter?.valid,
}"
/>
</div>
Expand Down Expand Up @@ -247,7 +247,7 @@ <h6 class="col-md-8 form-control-label">
/>
<div class="input-group-append"><span class="input-group-text"> GB </span></div>
</div>
<span class="help-block">Requested extra storage</span>
<span class="help-block">Requested volume storage</span>
</div>
<div class="col">
<div class="input-group">
Expand All @@ -264,13 +264,13 @@ <h6 class="col-md-8 form-control-label">
appInteger
[ngClass]="{
'is-invalid': resourceAdjustmentForm.controls.granted_volume_limit?.invalid,
'is-valid': resourceAdjustmentForm.controls.granted_volume_limit?.valid
'is-valid': resourceAdjustmentForm.controls.granted_volume_limit?.valid,
}"
[disabled]="resourceAdjustmentForm.controls.granted_volume_counter?.value === 0"
/>
<div class="input-group-append"><span class="input-group-text"> GB </span></div>
</div>
<span class="help-block">Amount of extra storage you want to grant</span>
<span class="help-block">Amount of volume storage you want to grant</span>
</div>
</div>

Expand Down Expand Up @@ -316,7 +316,7 @@ <h6 class="col-md-8 form-control-label">
required
[ngClass]="{
'is-invalid': resourceAdjustmentForm.controls.granted_object_storage?.invalid,
'is-valid': resourceAdjustmentForm.controls.granted_object_storage?.valid
'is-valid': resourceAdjustmentForm.controls.granted_object_storage?.valid,
}"
/>
<div class="input-group-append"><span class="input-group-text"> GB </span></div>
Expand Down
26 changes: 13 additions & 13 deletions src/app/projectmanagement/modals/modification-request/modification-request.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h6 class="col-md-8 form-control-label">
aria-describedby="{{ flavor.name }}_help"
[ngClass]="{
'is-invalid': name?.invalid && !adjustment,
'is-valid': name?.valid && !adjustment
'is-valid': name?.valid && !adjustment,
}"
/>
<div class="input-group-append">
Expand Down Expand Up @@ -160,7 +160,7 @@ <h6 class="col-md-8 form-control-label">
aria-describedby="adjust_{{ flavor.name }}_help"
[ngClass]="{
'is-invalid': name?.invalid,
'is-valid': name?.valid
'is-valid': name?.valid,
}"
/>
<!-- check what checkFlavorPairs() does -->
Expand Down Expand Up @@ -220,7 +220,7 @@ <h6 class="col-md-8 form-control-label">
appInteger
[ngClass]="{
'is-invalid': modificationForm.controls.project_application_renewal_volume_counter?.invalid,
'is-valid': modificationForm.controls.project_application_renewal_volume_counter?.valid
'is-valid': modificationForm.controls.project_application_renewal_volume_counter?.valid,
}"
/>
</div>
Expand Down Expand Up @@ -259,7 +259,7 @@ <h6 class="col-md-8 form-control-label">
appInteger
[ngClass]="{
'is-invalid': modificationForm.controls.project_application_renewal_volume_counter_adjusted?.invalid,
'is-valid': modificationForm.controls.project_application_renewal_volume_counter_adjusted?.valid
'is-valid': modificationForm.controls.project_application_renewal_volume_counter_adjusted?.valid,
}"
/>
</div>
Expand Down Expand Up @@ -291,7 +291,7 @@ <h6 class="col-md-8 form-control-label">
/>
<div class="input-group-append"><span class="input-group-text"> GB </span></div>
</div>
<span class="help-block">Current extra storage</span>
<span class="help-block">Current volume storage</span>
</div>
<div class="col">
<div class="input-group">
Expand All @@ -310,17 +310,17 @@ <h6 class="col-md-8 form-control-label">
appInteger
[ngClass]="{
'is-invalid': modificationForm.controls.project_application_renewal_volume_limit?.invalid,
'is-valid': modificationForm.controls.project_application_renewal_volume_limit?.valid
'is-valid': modificationForm.controls.project_application_renewal_volume_limit?.valid,
}"
[disabled]="modificationForm.controls.project_application_renewal_volume_counter?.value === 0"
/>
<div class="input-group-append"><span class="input-group-text"> GB </span></div>
</div>
<label for="id_project_application_renewal_volume_limit" class="help-block" *ngIf="!adjustment"
>How much total extra storage do you need in the future?</label
>What is the total amount of volume storage, that you need in the future?</label
>
<label for="id_project_application_renewal_volume_limit" class="help-block" *ngIf="adjustment"
>How much total extra storage does the user want in the future?</label
>How much total volume storage does the user want in the future?</label
>
</div>
</div>
Expand Down Expand Up @@ -351,7 +351,7 @@ <h6 class="col-md-8 form-control-label">
appInteger
[ngClass]="{
'is-invalid': modificationForm.controls.project_application_renewal_volume_limit_adjusted?.invalid,
'is-valid': modificationForm.controls.project_application_renewal_volume_limit_adjusted?.valid
'is-valid': modificationForm.controls.project_application_renewal_volume_limit_adjusted?.valid,
}"
[disabled]="modificationForm.controls.project_application_renewal_volume_counter_adjusted?.value === 0"
/>
Expand Down Expand Up @@ -407,7 +407,7 @@ <h6 class="col-md-8 form-control-label">
required
[ngClass]="{
'is-invalid': modificationForm.controls.project_application_renewal_object_storage?.invalid,
'is-valid': modificationForm.controls.project_application_renewal_object_storage?.valid
'is-valid': modificationForm.controls.project_application_renewal_object_storage?.valid,
}"
/>
<div class="input-group-append"><span class="input-group-text"> GB </span></div>
Expand Down Expand Up @@ -448,7 +448,7 @@ <h6 class="col-md-8 form-control-label">
required
[ngClass]="{
'is-invalid': modificationForm.controls.project_application_renewal_object_storage_adjust?.invalid,
'is-valid': modificationForm.controls.project_application_renewal_object_storage_adjust?.valid
'is-valid': modificationForm.controls.project_application_renewal_object_storage_adjust?.valid,
}"
/>
<div class="input-group-append"><span class="input-group-text"> GB </span></div>
Expand Down Expand Up @@ -553,7 +553,7 @@ <h6 class="col-md-8 form-control-label">
required
[ngClass]="{
'is-invalid': modificationForm.controls.project_application_renewal_cloud_service_user_number?.invalid,
'is-valid': modificationForm.controls.project_application_renewal_cloud_service_user_number?.valid
'is-valid': modificationForm.controls.project_application_renewal_cloud_service_user_number?.valid,
}"
/>
</div>
Expand Down Expand Up @@ -611,7 +611,7 @@ <h6 class="col-md-8 form-control-label">
[ngClass]="{
'is-invalid':
modificationForm.controls.project_application_renewal_comment?.invalid || !checkValidityComment(),
'is-valid': modificationForm.controls.project_application_renewal_comment?.valid && checkValidityComment()
'is-valid': modificationForm.controls.project_application_renewal_comment?.valid && checkValidityComment(),
}"
></textarea>
<div id="project_application_comment_feedback" class="invalid-feedback" *ngIf="!checkValidityComment()">
Expand Down

0 comments on commit ed936b2

Please sign in to comment.