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 2020/07/03 08:24:54 UTC
[incubator-dlab] branch DLAB-1902 created (now 1926a5a)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-1902
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 1926a5a [DLAB-1903]: Added slide toggle for quota per month
This branch includes the following new commits:
new 1926a5a [DLAB-1903]: Added slide toggle for quota per month
The 1 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1903]: Added slide toggle for quota
per month
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1902
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1926a5a4f96dda8c853cd1b1951ae2b367aa4baa
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Jul 3 11:24:37 2020 +0300
[DLAB-1903]: Added slide toggle for quota per month
---
.../manage-environment/manage-environment-dilog.component.html | 8 +++++++-
.../manage-environment/manage-environment-dilog.component.scss | 8 ++++++--
.../manage-environment/manage-environment-dilog.component.ts | 1 +
.../src/app/administration/management/management.component.ts | 2 +-
4 files changed, 15 insertions(+), 4 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 e3c77b8..f41d9cf 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
@@ -29,8 +29,8 @@
<mat-list>
<mat-list-item class="list-header">
<div class="username">Project</div>
+ <div class="period">Set per month</div>
<div class="quotes">Limit</div>
-<!-- <div class="action">Actions</div>-->
</mat-list-item>
<div class="scrolling-content" id="scrolling" formArrayName="projects">
<mat-list-item *ngFor="let item of usersEnvironments.controls; let i=index" [formGroupName]="i"
@@ -41,6 +41,12 @@
matTooltipPosition="above">{{ manageUsersForm.controls['projects']['controls'][i].value['project'] }}
</span>
</div>
+ <div class="period">
+<!-- <mat-slide-toggle formControlName="shared_image_enabled" labelPosition="after">-->
+ <mat-slide-toggle formControlName="setPerMonth">
+<!-- <span class="hold-label">Per month</span>-->
+ </mat-slide-toggle>
+ </div>
<div class="quotes">
<input type="number" (keypress)="CheckUtils.numberOnly($event)" min="0"
placeholder="Enter limit, in USD" formControlName="budget">
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 0245506..4e1aadf 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
@@ -39,11 +39,11 @@
}
.username {
- width: 45%;
+ width: 30%;
}
.quotes {
- width: 55%;
+ width: 45%;
margin-right: 10px;
position: relative;
@@ -55,6 +55,10 @@
}
}
+ .period{
+ width: 25%;
+ }
+
.total-budget {
border-top: 1px solid #edf1f5;
padding-top: 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 0b405be..78e0bc6 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
@@ -94,6 +94,7 @@ export class ManageEnvironmentComponent implements OnInit {
this._fb.array((this.data.projectsList || []).map((x: any) => this._fb.group({
project: x.name,
budget: [x.budget, [ this.userValidityCheck.bind(this)]],
+ setPerMonth: x.setPerMonth || true,
canBeStopped: x.canBeStopped,
canBeTerminated: x.canBeTerminated
}))));
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
index d7e5a45..a0d0767 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
@@ -112,7 +112,7 @@ export class ManagementComponent implements OnInit {
openManageEnvironmentDialog() {
this.projectService.getProjectsList().subscribe(projectsList => {
this.getTotalBudgetData().subscribe(total => {
- this.dialogRef = this.dialog.open(ManageEnvironmentComponent, { data: { projectsList, total }, panelClass: 'modal-sm' });
+ this.dialogRef = this.dialog.open(ManageEnvironmentComponent, { data: { projectsList, total }, panelClass: 'modal-xl-s' });
this.dialogRef.afterClosed().subscribe(result => result && this.setBudgetLimits(result));
}, () => this.toastr.error('Failed users list loading!', 'Oops!'));
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org