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 9c1384b [DLAB-1924]:Implemented UI changes for scheduler (#814)
9c1384b is described below
commit 9c1384b57ad2ffcef87e0e913cdf6df8c3a14b12
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Tue Jul 7 19:36:54 2020 +0300
[DLAB-1924]:Implemented UI changes for scheduler (#814)
---
.../src/app/resources/scheduler/scheduler.component.html | 15 ++++++++-------
.../notification-dialog/notification-dialog.component.ts | 12 +++++++-----
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
index a13ffa1..304c511 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
@@ -72,15 +72,15 @@
<div class="col-3">
<mat-form-field>
<input matInput [matDatepicker]="finishDate"
placeholder="Choose finish date"
- formControlName="finishDate">
- <mat-datepicker-toggle matSuffix
[for]="finishDate"></mat-datepicker-toggle>
- <mat-datepicker #finishDate></mat-datepicker>
+ formControlName="finishDate" [disabled]="destination.type
=== 'СOMPUTATIONAL' && inherit ||!enableSchedule">
+ <mat-datepicker-toggle matSuffix [for]="finishDate"
[disabled]="destination.type === 'СOMPUTATIONAL' && inherit
||!enableSchedule"></mat-datepicker-toggle>
+ <mat-datepicker #finishDate [disabled]="destination.type ===
'СOMPUTATIONAL' && inherit ||!enableSchedule"></mat-datepicker>
</mat-form-field>
</div>
<div class="col-3" *ngIf="destination.type === 'СOMPUTATIONAL';
else timezone">
<mat-form-field>
<input matInput [matDatepicker]="terminateDate"
placeholder="Choose terminate date"
- formControlName="terminateDate">
+ formControlName="terminateDate" >
<mat-datepicker-toggle matSuffix
[for]="terminateDate"></mat-datepicker-toggle>
<mat-datepicker #terminateDate></mat-datepicker>
</mat-form-field>
@@ -106,7 +106,8 @@
</dlab-time-picker>
</div>
<div class="control-group col-3 time-range">
- <dlab-time-picker [(pickTime)]="endTime" [label]="'Choose finish
time'" [disable]="!enableSchedule">
+<!-- <dlab-time-picker [(pickTime)]="endTime" [label]="'Choose
finish time'" [disable]="destination.type === 'СOMPUTATIONAL' && inherit
||!enableSchedule">-->
+ <dlab-time-picker [(pickTime)]="endTime" [label]="'Choose finish
time'" [disable]="true">
</dlab-time-picker>
</div>
<div class="control-group col-3 time-range"
*ngIf="destination.type === 'СOMPUTATIONAL'">
@@ -140,7 +141,7 @@
<label>Start date:</label>
<mat-button-toggle *ngFor="let day of weekdays; let i = index"
value="{{ day }}"
(change)="onDaySelect($event, day, 'start')"
- [disabled]="destination.type === 'СOMPUTATIONAL' && inherit ||
!enableSchedule"
+ [disabled]="(destination.type === 'СOMPUTATIONAL' && inherit)
|| !enableSchedule"
[checked]="selectedStartWeekDays[day.toLowerCase()]">{{ day[0]
}}
</mat-button-toggle>
</div>
@@ -148,7 +149,7 @@
<label>Stop date:</label>
<mat-button-toggle *ngFor="let day of weekdays; let i = index"
value="{{ day }}"
(change)="onDaySelect($event, day, 'stop')"
- [disabled]="destination.type === 'СOMPUTATIONAL' && inherit ||
!enableSchedule"
+ [disabled]="(destination.type === 'СOMPUTATIONAL' && inherit)
|| !enableSchedule"
[checked]="selectedStopWeekDays[day.toLowerCase()]">{{ day[0]
}}
</mat-button-toggle>
</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index 43688cf..1f9794c 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -41,20 +41,22 @@ import {Endpoint} from
'../../../administration/project/project.component';
<div *ngIf="data.template.notebook.length > 0">
Following notebook server<span
*ngIf="data.template.notebook.length>1">s</span>
<span *ngFor="let item of data.template.notebook">
- <span class="strong">{{ item.exploratory_name }}</span>
- <span *ngIf="data.template.notebook.length > 1">,
</span>
+ <span class="strong info">{{
item.exploratory_name}}</span> on project <span
+ class="strong info">{{ item.project }}</span>
+ <span *ngIf="data.template.notebook.length > 1"> ,
</span>
</span> will be stopped and all computational resources
will be stopped/terminated
</div>
<div *ngIf="data.template.cluster.length > 0">
<p *ngFor="let item of data.template.cluster">
Computational resource<span
*ngIf="data.template.cluster.length > 1">s </span>
- <span class="strong">{{ item.computational_name
}}</span> on <span
- class="strong">{{ item.exploratory_name }}</span>
+ <span class="strong info">{{ item.computational_name
}}</span> on <span
+ class="strong info">{{ item.exploratory_name
}}</span> on project<span
+ class="strong info">{{ item.project }}</span>
will be stopped
</p>
</div>
- <span class="strong">by a schedule in less than 15
minutes.</span>
+ <span class="strong info">by a schedule in less than 15
minutes.</span>
</div>
<div *ngIf="data.type === 'message'"><span
[innerHTML]="data.template"></span></div>
<div *ngIf="data.type === 'confirmation'" class="confirm-dialog">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
