Skip to content

Commit c6ea937

Browse files
committed
change default sorting in date range selection from monday to sunday
1 parent 69a2ef9 commit c6ea937

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/app/modules/reports/components/time-range-form/time-range-form.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {Store} from '@ngrx/store';
88
import {EntryState} from '../../../time-clock/store/entry.reducer';
99
import * as moment from 'moment';
1010

11+
1112
@Component({
1213
selector: 'app-time-range-form',
1314
templateUrl: './time-range-form.component.html',
@@ -38,7 +39,7 @@ export class TimeRangeFormComponent implements OnInit, OnChanges {
3839

3940
setInitialDataOnScreen() {
4041
this.reportForm.setValue({
41-
startDate: formatDate(moment().startOf('week').format('l'), DATE_FORMAT, 'en'),
42+
startDate: formatDate(moment().startOf('isoWeek').format('l'), DATE_FORMAT, 'en'),
4243
endDate: formatDate(moment().format('l'), DATE_FORMAT, 'en')
4344
});
4445
this.onSubmit();

src/app/modules/shared/components/input-date/input-date.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {Component, forwardRef} from '@angular/core';
22
import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
33
import { MatDatepicker } from '@angular/material/datepicker';
44
import { DATE_FORMAT_YEAR } from 'src/environments/environment';
5+
import { DateAdapter } from '@angular/material/core';
56
import * as moment from 'moment';
67

78
@Component({
@@ -22,7 +23,8 @@ export class InputDateComponent implements ControlValueAccessor {
2223
onChange = (_: any) => { };
2324
onTouch = () => { };
2425

25-
constructor() {
26+
constructor(date: DateAdapter<Date>) {
27+
date.getFirstDayOfWeek = () => 1;
2628
}
2729

2830
onInput(value: moment.Moment) {

0 commit comments

Comments
 (0)