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 37bca01 [DLAB-1902]: Support quota per month(UI) (#810) 37bca01 is described below commit 37bca01295f333ad74cfe817a832ce738695b75c Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com> AuthorDate: Fri Jul 3 18:05:31 2020 +0300 [DLAB-1902]: Support quota per month(UI) (#810) [DLAB-1902]: Support quota per month(UI) --- .../manage-environment/manage-environment-dilog.component.html | 8 +++++++- .../manage-environment/manage-environment-dilog.component.scss | 8 ++++++-- .../manage-environment/manage-environment-dilog.component.ts | 5 ++--- .../src/app/administration/management/management.component.ts | 2 +- 4 files changed, 16 insertions(+), 7 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..aa78f05 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="is_monthly_budget"> +<!-- <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..6f9f018 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 @@ -93,9 +93,8 @@ export class ManageEnvironmentComponent implements OnInit { this.manageUsersForm.setControl('projects', this._fb.array((this.data.projectsList || []).map((x: any) => this._fb.group({ project: x.name, - budget: [x.budget, [ this.userValidityCheck.bind(this)]], - canBeStopped: x.canBeStopped, - canBeTerminated: x.canBeTerminated + budget: [x.budget.value, [ this.userValidityCheck.bind(this)]], + is_monthly_budget: x.budget.is_monthly_budget, })))); } 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-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org