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/29 15:29:59 UTC
[incubator-dlab] branch develop updated: [DLAB-1964]: Limited
project quota (#838)
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 4d9475b [DLAB-1964]: Limited project quota (#838)
4d9475b is described below
commit 4d9475b9ae3866a648d2034298ad3a447b0f3782
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Wed Jul 29 18:29:48 2020 +0300
[DLAB-1964]: Limited project quota (#838)
[DLAB-1964]: Limited project quota
---
.../manage-environment-dilog.component.html | 6 ++++--
.../manage-environment-dilog.component.scss | 3 ++-
.../manage-environment-dilog.component.ts | 2 +-
.../reporting-grid/reporting-grid.component.scss | 6 ------
.../resources/webapp/src/assets/styles/_theme.scss | 19 ++++++++++++++++---
5 files changed, 23 insertions(+), 13 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 c555280..18aa544 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
@@ -49,8 +49,10 @@
<input type="number" (keypress)="CheckUtils.numberOnly($event)" min="0"
placeholder="Enter limit, in USD" formControlName="budget">
<span class="error"
- *ngIf="manageUsersForm?.controls['projects']['controls'][i].controls['budget'].hasError('overrun')">Per-user
+ *ngIf="manageUsersForm?.controls['projects']['controls'][i].controls['budget'].hasError('overrun')">Projects
quotes cannot be greater than total budget</span>
+ <span class="error"
+ *ngIf="manageUsersForm?.controls['projects']['controls'][i].controls['budget'].hasError('max')">Project budget cannot be higher than 1000000000</span>
</div>
</mat-list-item>
</div>
@@ -63,7 +65,7 @@
<div class="quotes">
<input type="number" (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')">Total budget cannot be lower than a sum of projects quotes</span>
</div>
</mat-list-item>
</div>
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 4e1aadf..1cea435 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,8 +50,9 @@
.error {
position: absolute;
left: 0;
- top: 34px;
+ top: 37px;
font-family: 'Open Sans', sans-serif;
+ font-size: 11px;
}
}
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 848daf7..ce29827 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
@@ -99,7 +99,7 @@ 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.value, [ this.userValidityCheck.bind(this)]],
+ budget: [x.budget.value, [ Validators.max(1000000000), this.userValidityCheck.bind(this)]],
monthlyBudget: x.budget.monthlyBudget,
}))));
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss
index 44029ce..51e5344 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss
@@ -38,10 +38,6 @@
.table-wrapper {
width: 100%;
- //position: sticky;
- //z-index: 101;
- //overflow-y: auto;
- //transform:rotateX(180deg);
display: block;
height: calc(100vh - 130px);
overflow: auto;
@@ -53,7 +49,6 @@
min-width: 1100px;
overflow: auto;
border-collapse: inherit;
- //transform:rotateX(180deg);
.mat-cell {
vertical-align: middle;
@@ -62,7 +57,6 @@
tr {
th {
padding-right: 5px;
- //z-index: 2 !important;
&.th_charges{
z-index: 16 !important;
}
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index fe8df93..04693c0 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -826,13 +826,21 @@ mat-progress-bar {
}
#range-picker .ng-daterangepicker,
-#range-picker .ng-daterangepicker.is-active,
-#range-picker .ng-daterangepicker .calendar {
+ {
border: none;
border-radius: 0;
box-shadow: none;
}
+#range-picker .ng-daterangepicker .calendar{
+ z-index: 102;
+ border: 1px solid rgba(234, 234, 234, 0.64);
+ border-radius: 0;
+ box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
+ 0 2px 2px 0 rgba(0, 0, 0, 0.14),
+ 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+}
+
#range-picker .ng-daterangepicker .calendar::after {
border-top: 1px solid rgba(234, 234, 234, 0.64);
border-left: 1px solid rgba(234, 234, 234, 0.64);
@@ -843,7 +851,6 @@ mat-progress-bar {
color: #718ba6;
border: none;
border-radius: 0px;
-
}
#range-picker .ng-daterangepicker .calendar .side-container .side-button.is-active,
@@ -853,6 +860,12 @@ mat-progress-bar {
font-size: 13px;
}
+#range-picker .ng-daterangepicker .calendar .side-container .side-button.is-active {
+ color: #fff;
+ background: #35afd5;
+ border-radius: 10px;
+}
+
#range-picker .ng-daterangepicker .calendar .calendar-container .day-num.is-active,
#range-picker .ng-daterangepicker .calendar .calendar-container .days .day-num:hover {
background: #35afd5;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org