Skip to content

Commit 0e06a98

Browse files
feat: TT-536 remove date out in time entries (#806)
1 parent 3c07126 commit 0e06a98

File tree

2 files changed

+2
-58
lines changed

2 files changed

+2
-58
lines changed

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

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</div>
7373

7474
<div class="form-group row" >
75-
<label class="col-12 col-sm-2">Date in:</label>
75+
<label class="col-12 col-sm-2">Date:</label>
7676
<div class="col-12 col-sm-4" tabindex="0">
7777
<input
7878
matInput
@@ -108,28 +108,7 @@
108108
</div>
109109

110110
<div class="form-group row" *ngIf="!goingToWorkOnThis || !canMarkEntryAsWIP">
111-
<label class="col-12 col-sm-2">Date out:</label>
112-
<div class="col-12 col-sm-4" tabindex="0">
113-
<input
114-
matInput
115-
formControlName="end_date"
116-
id="end_date"
117-
class="form-control"
118-
aria-label="Small"
119-
aria-describedby="inputGroup-sizing-sm"
120-
[disabled]="true"
121-
[class.is-invalid]="end_date.invalid && end_date.touched"
122-
required
123-
[max]="getCurrentDate()"
124-
onkeydown="return false"
125-
[tabIndex]="1"
126-
(click)="openOrCloseDatePicker(datepickerEndDate)"
127-
(dateInput)="end_date.setValue($event.value.format('YYYY-MM-DD'))"
128-
[matDatepicker]="datepickerEndDate"
129-
/>
130-
<mat-datepicker #datepickerEndDate></mat-datepicker>
131-
</div>
132-
111+
<div class="col-12 col-sm-6"></div>
133112
<label class="col-12 col-sm-2">Time out:</label>
134113
<div class="col-12 col-sm-4">
135114
<ngx-timepicker-field

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

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -517,32 +517,6 @@ describe('DetailsFieldsComponent', () => {
517517
expect(component.projectSelected.emit).toHaveBeenCalledWith(data);
518518
});
519519

520-
it('on selected start_date should change end_date', () => {
521-
const expectedStartDate = '2020-02-05';
522-
523-
component.onStartDateChange(expectedStartDate);
524-
fixture.detectChanges();
525-
const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date');
526-
527-
expect(endDateInput.value).toEqual(expectedStartDate);
528-
});
529-
530-
it('on selected end_date should not change start_date', () => {
531-
const expectedStartDate = '2020-02-05';
532-
const expectedEndDate = '2020-02-06';
533-
534-
component.ngOnInit();
535-
fixture.detectChanges();
536-
const startDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#start_date');
537-
const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date');
538-
startDateInput.value = expectedStartDate;
539-
endDateInput.value = expectedEndDate;
540-
endDateInput.dispatchEvent(new Event('#end_date'));
541-
542-
expect(endDateInput.value).not.toEqual(startDateInput.value);
543-
expect(startDateInput.value).toEqual(expectedStartDate);
544-
});
545-
546520
it('on get current date should return expected date', () => {
547521
const expectedDate = moment(new Date()).format(DATE_FORMAT_YEAR);
548522

@@ -560,15 +534,6 @@ describe('DetailsFieldsComponent', () => {
560534
expect(startDateInput.max).toEqual(expectedDate);
561535
});
562536

563-
it('on the input with id #end_date we could get the current Date ', () => {
564-
fixture.detectChanges();
565-
const expectedDate = moment(new Date()).format(DATE_FORMAT_YEAR);
566-
const endDateInput = fixture.debugElement.nativeElement.querySelector('[id=end_date]');
567-
568-
expect(endDateInput.id).toEqual('end_date');
569-
expect(endDateInput.max).toEqual(expectedDate);
570-
});
571-
572537
const diffParams = [
573538
{
574539
case: 'positive should return correctly diff',

0 commit comments

Comments
 (0)