Skip to content

Commit bc3c5e2

Browse files
committed
fix: TT-205 refactor code and move style
1 parent 65d4d82 commit bc3c5e2

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

src/app/modules/shared/components/details-fields/details-fields.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
(ngModelChange)="onStartDateChange($event)"
9494
[max]="getCurrentDate()"
9595
onkeydown="return false"
96-
(click)="datepickerStartDate.opened ? datepickerStartDate.close() : datepickerStartDate.open()"
96+
(click)="openOrCloseDatePicker(datepickerStartDate)"
9797
(dateInput)="start_date.setValue($event.value.format('YYYY-MM-DD'))"
9898
[matDatepicker]="datepickerStartDate"
9999
/>
@@ -126,7 +126,7 @@
126126
required
127127
[max]="getCurrentDate()"
128128
onkeydown="return false"
129-
(click)="datepickerEndDate.opened ? datepickerEndDate.close() : datepickerEndDate.open()"
129+
(click)="openOrCloseDatePicker(datepickerEndDate)"
130130
(dateInput)="end_date.setValue($event.value.format('YYYY-MM-DD'))"
131131
[matDatepicker]="datepickerEndDate"
132132
/>

src/app/modules/shared/components/details-fields/details-fields.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,7 @@ input[type="date"]::-webkit-clear-button {
115115
border-radius: 5px;
116116
margin-top: 10px;
117117
}
118+
119+
::ng-deep .cdk-overlay-container {
120+
z-index: 1100 !important;
121+
}

src/app/modules/shared/components/details-fields/details-fields.component.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { ProjectSelectedEvent } from './project-selected-event';
2020
import { get } from 'lodash';
2121
import { DATE_FORMAT, DATE_FORMAT_YEAR } from 'src/environments/environment';
2222
import { TechnologiesComponent } from '../technologies/technologies.component';
23+
import { MatDatepicker } from '@angular/material/datepicker';
2324

2425
type Merged = TechnologyState & ProjectState & ActivityState & EntryState;
2526
@Component({
@@ -290,4 +291,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
290291
}
291292
this.shouldRestartEntry = !this.entryToEdit?.running && this.goingToWorkOnThis;
292293
}
294+
295+
openOrCloseDatePicker(datepicker: MatDatepicker<Date>): void {
296+
return datepicker.opened ? datepicker.close() : datepicker.open();
297+
}
293298
}

src/styles.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,3 @@ body {
3232
z-index: 1100 !important;
3333
}
3434

35-
.cdk-overlay-container {
36-
z-index: 1100 !important;
37-
}

0 commit comments

Comments
 (0)