You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2019/12/26 15:07:26 UTC
[incubator-dlab] branch develop updated: [DLAB-1065]:Prevented
putting some values and align error message (#510)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 7c5c665 [DLAB-1065]:Prevented putting some values and align error message (#510)
7c5c665 is described below
commit 7c5c665b4a7257213dec5782b2197814a94ad594
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Thu Dec 26 17:07:19 2019 +0200
[DLAB-1065]:Prevented putting some values and align error message (#510)
---
.../manage-environment-dilog.component.html | 13 +++++++------
.../manage-environment-dilog.component.scss | 4 ++--
.../manage-environment-dilog.component.ts | 6 ++++++
.../main/resources/webapp/src/app/core/util/checkUtils.ts | 8 ++++++++
4 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html
index b95a91f..91c3e1e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html
@@ -40,11 +40,10 @@
matTooltipPosition="above">{{ manageUsersForm.controls['projects'].controls[i].value['project'] }}
</div>
<div class="quotes">
- <input type="number" (keypress)="CheckUtils.isNumberKey($event)" min="0"
+ <input type="text" (keypress)="CheckUtils.numberOnly($event)" min="0"
placeholder="Enter limit, in USD" formControlName="budget">
<span class="error"
- *ngIf="!manageUsersForm?.controls['projects'].controls[i].controls['budget'].valid && !manageUsersForm?.controls['projects'].controls[i].controls['budget'].hasError('overrun')">Only
- positive integers are allowed</span>
+ *ngIf="!manageUsersForm?.controls['projects'].controls[i].controls['budget'].valid && !manageUsersForm?.controls['projects'].controls[i].controls['budget'].hasError('overrun')">Budget can contain only integer value</span>
<span class="error"
*ngIf="manageUsersForm?.controls['projects'].controls[i].controls['budget'].hasError('overrun')">Per-user
quotes cannot be greater than total budget</span>
@@ -80,10 +79,12 @@
<div class="control-group total-budget">
<label class="label">Total budget</label>
<div class="control">
- <input type="number" (keypress)="CheckUtils.isNumberKey($event)" formControlName="total"
+ <input type="text" (keypress)="CheckUtils.numberOnly($event)" formControlName="total"
placeholder="Enter total budget, in USD">
- <span class="error" *ngIf="manageUsersForm?.controls['total'].hasError('overrun')">Total budget
- cannot be lower than a sum of users quotes</span>
+ <span class="error" *ngIf="manageUsersForm?.controls['total'].hasError('overrun')">Budget can contain only integer value</span>
+ <span class="error"
+ *ngIf="!manageUsersForm?.controls['total'].valid && !manageUsersForm?.controls['total'].hasError('overrun')">Only
+ positive integers are allowed</span>
</div>
</div>
<div class="text-center m-top-30">
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.scss
index 4c485bf..cb18ac1 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.scss
@@ -50,7 +50,7 @@
.error {
position: absolute;
left: 0;
- bottom: -14px;
+ top: 35px;
}
}
@@ -98,7 +98,7 @@
.error {
position: absolute;
left: 0;
- bottom: -14px;
+ bottom: -15px;
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
index 8ad8eee..39f598e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
@@ -95,12 +95,18 @@ export class ManageEnvironmentComponent implements OnInit {
}
private totalValidityCheck(control) {
+ if(control && control.value === null && control.dirty){
+ return { integerError: true }
+ }
return (control && control.value)
? (control.value >= this.getCurrentUsersTotal() ? null : { overrun: true })
: null;
}
private userValidityCheck(control) {
+ if(control && isNaN(control.value)){
+ return { budget: true }
+ }
if (control && control.value) {
return (this.getCurrentTotalValue() && this.getCurrentTotalValue() < this.getCurrentUsersTotal()) ? { overrun: true } : null;
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/checkUtils.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/checkUtils.ts
index 994d18a..7994030 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/util/checkUtils.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/util/checkUtils.ts
@@ -40,6 +40,14 @@ export class CheckUtils {
return true;
}
+ public static numberOnly(event): boolean {
+ const charCode = (event.which) ? event.which : event.keyCode;
+ if (charCode > 31 && (charCode < 48 || charCode > 57) && charCode !== 46 && charCode !== 44) {
+ return false;
+ }
+ return true;
+ }
+
public static delimitersFiltering(resource): string {
return resource.replace(RegExp(PATTERNS.delimitersRegex, 'g'), '').toString().toLowerCase();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org