Skip to content

change default sorting in date range selection from monday to sunday #880

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 6 commits into from
Jun 13, 2022
Merged

change default sorting in date range selection from monday to sunday #880

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6ea937
change default sorting in date range selection from monday to sunday
abigailscl Jun 1, 2022
fafe5bc
test: TT-33 include ticket changes in tests
andresacg30 Jun 7, 2022
b6e1c25
Fix: TT-33 Correct break lines
abigailscl Jun 8, 2022
ea8f152
fix: TT-33 unused variable deleted
andresacg30 Jun 10, 2022
d399fab
Merge branch 'TT-33-load-data-from-monday-to-sunday-on-reports-page' …
andresacg30 Jun 10, 2022
0950e04
fix code smell
abigailscl Jun 13, 2022
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
Next Next commit
change default sorting in date range selection from monday to sunday
  • Loading branch information
@abigailscl
abigailscl committed Jun 1, 2022
commit c6ea937579287964da714b44a462f5095c32fcca
3 changes: 2 additions & 1 deletion src/app/modules/reports/components/time-range-form/time-range-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {Store} from '@ngrx/store';
import {EntryState} from '../../../time-clock/store/entry.reducer';
import * as moment from 'moment';

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove line break


@Component({
selector: 'app-time-range-form',
templateUrl: './time-range-form.component.html',
Expand Down Expand Up @@ -38,7 +39,7 @@ export class TimeRangeFormComponent implements OnInit, OnChanges {

setInitialDataOnScreen() {
this.reportForm.setValue({
startDate: formatDate(moment().startOf('week').format('l'), DATE_FORMAT, 'en'),
startDate: formatDate(moment().startOf('isoWeek').format('l'), DATE_FORMAT, 'en'),
endDate: formatDate(moment().format('l'), DATE_FORMAT, 'en')
});
this.onSubmit();
Expand Down
4 changes: 3 additions & 1 deletion src/app/modules/shared/components/input-date/input-date.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {Component, forwardRef} from '@angular/core';
import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
import { MatDatepicker } from '@angular/material/datepicker';
import { DATE_FORMAT_YEAR } from 'src/environments/environment';
import { DateAdapter } from '@angular/material/core';
import * as moment from 'moment';

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

constructor() {
constructor(date: DateAdapter<Date>) {
date.getFirstDayOfWeek = () => 1;
}

onInput(value: moment.Moment) {
Expand Down