Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
8 changes: 4 additions & 4 deletions src/app/store/functions.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export function transformAddress(input: any) {
return {
region: { uk: input.region, en: input.regionEn },
city: { uk: input.city, en: input.cityEn },
district: { uk: input.district, en: input.districtEn },
region: { uk: input.regionUk, en: input.regionEn },
city: { uk: input.cityUk, en: input.cityEn },
district: { uk: input.districtUk, en: input.districtEn },
address: {
uk: `${input.street} ${input.houseNumber}, корп.- ${input.houseCorpus || ''}, п.${input.entranceNumber}`,
uk: `${input.streetUk} ${input.houseNumber}, корп.- ${input.houseCorpus || ''}, п.${input.entranceNumber}`,
en: `${input.streetEn} ${input.houseNumber}, b.- ${input.houseCorpus || ''}, e.${input.entranceNumber}`
},
commentToAddressForClient: input.addressComment || ''
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<div *ngIf="!isEditable || uneditableStatus" class="date_to_show">
<!-- Clear when back send normal value -->
<span *ngIf="date === '-'">{{ date }}</span>
<span *ngIf="date !== '-'">{{ date | date: 'dd.MM.y' }}</span>
<button *ngIf="!isEditable && !uneditableStatus" class="pencil" (click)="edit()" (keydown)="edit($event)"></button>
</div>

<div class="editable-date" *ngIf="isEditable && !uneditableStatus">
<mat-form-field appearance="fill" class="date-form-field">
<input matInput [matDatepicker]="picker1" [min]="current" [value]="date" (dateChange)="changeData($event)" id="date-input" />
<mat-datepicker-toggle matSuffix [for]="picker1" color="accent"></mat-datepicker-toggle>
<mat-datepicker #picker1></mat-datepicker>
</mat-form-field>
</div>
<mat-form-field appearance="fill" class="date-form-field">
<input
matInput
[matDatepicker]="picker1"
[min]="current"
[value]="date"
[disabled]="uneditableStatus"
(dateChange)="changeData($event)"
id="date-input"
/>
<mat-datepicker-toggle
matSuffix
(keydown)="edit(picker1, $event)"
[disabled]="uneditableStatus"
(click)="edit(picker1)"
></mat-datepicker-toggle>
<mat-datepicker #picker1></mat-datepicker>
</mat-form-field>
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,51 @@
top: -10px;
}

::ng-deep .mat-datepicker-content.mat-accent .mat-calendar-body-selected {
:host ::ng-deep .mat-mdc-form-field {
height: 100%;

.mat-mdc-text-field-wrapper {
background-color: transparent;
border-radius: 0;

.mat-mdc-form-field-flex {
height: 100%;
align-items: center;

.mat-mdc-form-field-infix {
min-height: unset;
}
}

.mdc-line-ripple {
display: none;
}
}

.mat-mdc-form-field-subscript-wrapper {
display: none;
}
}

:host ::ng-deep .mat-datepicker-content.mat-accent .mat-calendar-body-selected {
background-color: var(--ubs-button-light-green);
}

::ng-deep .mat-datepicker-toggle-active.mat-accent {
:host ::ng-deep .mat-datepicker-toggle-active.mat-accent {
color: var(--ubs-button-light-green);
}

::ng-deep .mat-form-field-appearance-fill .mat-form-field-flex {
:host ::ng-deep .mat-form-field-appearance-fill .mat-form-field-flex {
background-color: white;
}

::ng-deep .mdc-text-field--filled:not(.mdc-text-field--disabled) .mdc-text-field__input {
:host ::ng-deep .mdc-text-field--filled:not(.mdc-text-field--disabled) .mdc-text-field__input {
font-size: 12px;
font-weight: 500;
padding-left: 5px;
}

::ng-deep .mdc-text-field--no-label:not(.mdc-text-field--outlined, .mdc-text-field--textarea) .mat-mdc-form-field-infix {
:host ::ng-deep .mdc-text-field--no-label:not(.mdc-text-field--outlined, .mdc-text-field--textarea) .mat-mdc-form-field-infix {
padding-top: 8px;
}

Expand Down
Loading
Loading