Skip to content

feat: TT-536 remove date out in time entries #806

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

Merged
merged 1 commit into from
Feb 9, 2022
Merged

feat: TT-536 remove date out in time entries #806

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
25 changes: 2 additions & 23 deletions src/app/modules/shared/components/details-fields/details-fields.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</div>

<div class="form-group row" >
<label class="col-12 col-sm-2">Date in:</label>
<label class="col-12 col-sm-2">Date:</label>
<div class="col-12 col-sm-4" tabindex="0">
<input
matInput
Expand Down Expand Up @@ -108,28 +108,7 @@
</div>

<div class="form-group row" *ngIf="!goingToWorkOnThis || !canMarkEntryAsWIP">
<label class="col-12 col-sm-2">Date out:</label>
<div class="col-12 col-sm-4" tabindex="0">
<input
matInput
formControlName="end_date"
id="end_date"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
[disabled]="true"
[class.is-invalid]="end_date.invalid && end_date.touched"
required
[max]="getCurrentDate()"
onkeydown="return false"
[tabIndex]="1"
(click)="openOrCloseDatePicker(datepickerEndDate)"
(dateInput)="end_date.setValue($event.value.format('YYYY-MM-DD'))"
[matDatepicker]="datepickerEndDate"
/>
<mat-datepicker #datepickerEndDate></mat-datepicker>
</div>

<div class="col-12 col-sm-6"></div>
<label class="col-12 col-sm-2">Time out:</label>
<div class="col-12 col-sm-4">
<ngx-timepicker-field
Expand Down
35 changes: 0 additions & 35 deletions src/app/modules/shared/components/details-fields/details-fields.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,32 +517,6 @@ describe('DetailsFieldsComponent', () => {
expect(component.projectSelected.emit).toHaveBeenCalledWith(data);
});

it('on selected start_date should change end_date', () => {
const expectedStartDate = '2020-02-05';

component.onStartDateChange(expectedStartDate);
fixture.detectChanges();
const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date');

expect(endDateInput.value).toEqual(expectedStartDate);
});

it('on selected end_date should not change start_date', () => {
const expectedStartDate = '2020-02-05';
const expectedEndDate = '2020-02-06';

component.ngOnInit();
fixture.detectChanges();
const startDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#start_date');
const endDateInput: HTMLInputElement = fixture.debugElement.nativeElement.querySelector('#end_date');
startDateInput.value = expectedStartDate;
endDateInput.value = expectedEndDate;
endDateInput.dispatchEvent(new Event('#end_date'));

expect(endDateInput.value).not.toEqual(startDateInput.value);
expect(startDateInput.value).toEqual(expectedStartDate);
});

it('on get current date should return expected date', () => {
const expectedDate = moment(new Date()).format(DATE_FORMAT_YEAR);

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

it('on the input with id #end_date we could get the current Date ', () => {
fixture.detectChanges();
const expectedDate = moment(new Date()).format(DATE_FORMAT_YEAR);
const endDateInput = fixture.debugElement.nativeElement.querySelector('[id=end_date]');

expect(endDateInput.id).toEqual('end_date');
expect(endDateInput.max).toEqual(expectedDate);
});

const diffParams = [
{
case: 'positive should return correctly diff',
Expand Down