Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RMA-93703 #97

Merged
merged 1 commit into from
Feb 11, 2022
Merged

RMA-93703 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions projects/dxc-ngx-cdk/src/lib/dxc-cron-editor/dxc-cron-editor.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</div>
<div *ngIf="this.advancedForm.get('subTab').value=='cust'">
<div class="row">
<div class="col-md-6">
<div class="col-md-6 cron-editor-tab-content-padding">
<mat-form-field formGroupName="custom">
<dxc-label id="lbl_startDays" [text]="resource?.daysStartFrom.description"></dxc-label>
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false" tabIndexValue="-1" tabindex="0"
Expand All @@ -34,7 +34,7 @@

</mat-form-field>
</div>
<div class="col-md-6">
<div class="col-md-6 cron-editor-tab-content-padding">
<mat-form-field formGroupName="custom">
<dxc-label id="lbl_days" [text]="resource?.onTheDay.description"></dxc-label>
<dxc-select class="main-dd-filter" [multiple]="true" [ngClass]="options.formSelectClass" [customHandler]="false" tabIndexValue="-1" tabindex="0"
Expand All @@ -50,7 +50,7 @@
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="col-md-6 cron-editor-tab-content-padding">
<mat-form-field formGroupName="custom" class="mt-3">
<dxc-label id="lbl_startMonth" [text]="resource?.monthsStartFrom.description"></dxc-label>
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false" tabIndexValue="-1" tabindex="0"
Expand All @@ -64,7 +64,7 @@

</mat-form-field>
</div>
<div class="col-md-6">
<div class="col-md-6 cron-editor-tab-content-padding">

<mat-form-field formGroupName="custom" class="mt-3">
<dxc-label id="lbl_month" [text]="resource?.ofMonth.description"></dxc-label>
Expand All @@ -82,7 +82,7 @@
</div>

<div class="row">
<div class="col-md-6">
<div class="col-md-6 cron-editor-tab-content-padding">
<mat-form-field formGroupName="custom" class="mt-3">
<dxc-label id="lbl_startYear" [text]="resource?.yearsStartFrom.description"></dxc-label>
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false" tabIndexValue="-1" tabindex="0"
Expand All @@ -95,7 +95,7 @@
</dxc-select>
</mat-form-field>
</div>
<div class="col-md-6">
<div class="col-md-6 cron-editor-tab-content-padding">
<mat-form-field formGroupName="custom" class="mt-3">
<dxc-label id="lbl_year" [text]="resource?.ofYear.description"></dxc-label>
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false" tabIndexValue="-1" tabindex="0"
Expand Down
4 changes: 4 additions & 0 deletions projects/dxc-ngx-cdk/src/lib/dxc-cron-editor/dxc-cron-editor.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.cron-editor-tab-content {
margin-top: 24px;
border-radius: 8px;
overflow: hidden;
}

.cron-editor-main .cron-editor-container .cron-editor-radio {
Expand Down Expand Up @@ -47,3 +48,6 @@
.checkbox-margin {
margin: 0 10px;
}
.cron-editor-tab-content-padding {
padding-right: 1.5rem;
}
48 changes: 24 additions & 24 deletions ...-ngx-cdk/src/lib/dxc-cron-editor/dxc-time-picker-cron/dxc-time-picker-cron.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<span [formGroup]="parent.control">
<ng-container *ngIf="!hideHours">
<div class="row">
<div class="col-md-6">
<div class="col-md-6 cron-editor-tab-content-padding">
<mat-form-field *ngIf="showStart" class="mt-3">
<dxc-label id="lbl_starthour" [text]="resource?.hourssStartFrom.description"></dxc-label>
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false" tabIndexValue="-1"
tabindex="0" aria-labelledby="lbl_starthour" id="lbl_starthour" matTooltip="" margin="small" size="fitContent"
formControlName="startHours">
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false"
tabIndexValue="-1" tabindex="0" aria-labelledby="lbl_starthour" id="lbl_starthour" matTooltip=""
margin="small" size="fitContent" formControlName="startHours">
<dxc-select-option value="none" label="None" *ngIf="includeNone">
</dxc-select-option>
<dxc-select-option *ngFor="let hour of hours" value="{{hour}}" label="{{hour}}">
Expand All @@ -15,12 +15,12 @@

</mat-form-field>
</div>
<div class="col-md-6">
<div class="col-md-6 cron-editor-tab-content-padding">
<mat-form-field class="mt-3">
<dxc-label id="lbl_hours" [text]="resource?.ofHour.description"></dxc-label>
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false" tabIndexValue="-1"
tabindex="0" aria-labelledby="lbl_hours" id="lbl_hours" matTooltip="" margin="small" size="fitContent"
formControlName="hours">
<dxc-label id="lbl_hours" [text]="resource?.ofHour.description"></dxc-label>
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false"
tabIndexValue="-1" tabindex="0" aria-labelledby="lbl_hours" id="lbl_hours" matTooltip="" margin="small"
size="fitContent" formControlName="hours">
<dxc-select-option value="*" label="Every" *ngIf="includeEvery">
</dxc-select-option>
<dxc-select-option *ngFor="let hour of hours" value="{{hour}}" label="{{hour}}">
Expand All @@ -35,12 +35,12 @@
<ng-container *ngIf="!hideMinutes">
<span *ngIf="!hideHours">:</span>
<div class="row">
<div class="col-md-6">
<div class="col-md-6 cron-editor-tab-content-padding">
<mat-form-field *ngIf="showStart" class="mt-3">
<dxc-label id="lbl_startMinutes" [text]="resource?.minutesStartFrom.description"></dxc-label>
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false" tabIndexValue="-1"
tabindex="0" aria-labelledby="lbl_startMinutes" id="lbl_startMinutes" matTooltip="" margin="small" size="fitContent"
formControlName="startMinutes">
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false"
tabIndexValue="-1" tabindex="0" aria-labelledby="lbl_startMinutes" id="lbl_startMinutes" matTooltip=""
margin="small" size="fitContent" formControlName="startMinutes">
<dxc-select-option value="none" label="None" *ngIf="includeNone">
</dxc-select-option>
<dxc-select-option *ngFor="let minute of minutes" value="{{minute}}" label="{{minute}}">
Expand All @@ -49,22 +49,22 @@

</mat-form-field>
</div>
<div class="col-md-6">
<div class="col-md-6 cron-editor-tab-content-padding">

<mat-form-field class="mt-3">
<dxc-label id="lbl_minutes" [text]="resource?.ofMinute.description"></dxc-label>
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false" tabIndexValue="-1"
tabindex="0" aria-labelledby="lbl_minutes" id="lbl_minutes" matTooltip="" margin="small" size="fitContent"
formControlName="minutes">
<dxc-select-option value="*" label="Every" *ngIf="includeEvery">
</dxc-select-option>
<dxc-select-option *ngFor="let minute of minutes" value="{{minute}}" label="{{minute}}">
</dxc-select-option>
</dxc-select>
<dxc-select class="main-dd-filter" [ngClass]="options.formSelectClass" [customHandler]="false"
tabIndexValue="-1" tabindex="0" aria-labelledby="lbl_minutes" id="lbl_minutes" matTooltip="" margin="small"
size="fitContent" formControlName="minutes">
<dxc-select-option value="*" label="Every" *ngIf="includeEvery">
</dxc-select-option>
<dxc-select-option *ngFor="let minute of minutes" value="{{minute}}" label="{{minute}}">
</dxc-select-option>
</dxc-select>

</mat-form-field>
</div>
</div>
</div>

</ng-container>

Expand Down Expand Up @@ -100,4 +100,4 @@
</mat-select>
</mat-form-field>
</ng-container>
</span>
</span>
3 changes: 3 additions & 0 deletions ...-ngx-cdk/src/lib/dxc-cron-editor/dxc-time-picker-cron/dxc-time-picker-cron.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.cron-editor-tab-content-padding {
padding-right: 1.5rem;
}