-
Notifications
You must be signed in to change notification settings - Fork 47
Bugfix/table cell date and address fix #3930
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.
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
Merged
Merged
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
aa51e59
fixed address change in admin table
witolDark be2613b
removed redundant layer of checks in cell date component, fixed datep…
witolDark a1f7e90
req changes
witolDark a75a435
tests
witolDark 0b258d1
tests
witolDark e247f11
removed unused output
witolDark aa23947
fixed editing for order with active payment link
witolDark 9654dcf
fixed switching tariff while editing order
witolDark 04fda97
order list tests fix
witolDark be3cf63
tests fix
witolDark 21476db
removed unused variable
witolDark 1b794ea
table cell date test
witolDark File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 18 additions & 14 deletions
32
...p/ubs/ubs-admin/components/ubs-admin-table/table-cell-date/table-cell-date.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.