Skip to content

Commit d399fab

Browse files
committed
Merge branch 'TT-33-load-data-from-monday-to-sunday-on-reports-page' of https://github.com/ioet/time-tracker-ui into TT-33-load-data-from-monday-to-sunday-on-reports-page
2 parents ea8f152 + b6e1c25 commit d399fab

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import {EntryState} from '../../../time-clock/store/entry.reducer';
99
import * as moment from 'moment';
1010
import { DateAdapter } from '@angular/material/core';
1111

12-
13-
1412
@Component({
1513
selector: 'app-time-range-form',
1614
templateUrl: './time-range-form.component.html',
@@ -29,8 +27,8 @@ export class TimeRangeFormComponent implements OnInit, OnChanges {
2927
endDate: this.endDate
3028
});
3129
date.getFirstDayOfWeek = () => 1;
32-
3330
}
31+
3432
ngOnInit(): void {
3533
this.setInitialDataOnScreen();
3634
}
@@ -48,6 +46,7 @@ export class TimeRangeFormComponent implements OnInit, OnChanges {
4846
});
4947
this.onSubmit();
5048
}
49+
5150
onSubmit() {
5251
const endDate = moment(this.endDate.value).endOf('day');
5352
const startDate = moment(this.startDate.value).startOf('day');

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import * as moment from 'moment';
1010
import { SimpleChange } from '@angular/core';
1111
import { DateAdapter } from '@angular/material/core';
1212

13-
1413
describe('Reports Page', () => {
1514
describe('TimeRangeFormComponent', () => {
1615
let component: TimeRangeFormComponent;
@@ -56,7 +55,6 @@ describe('Reports Page', () => {
5655
}).compileComponents();
5756
store = TestBed.inject(MockStore);
5857
date = TestBed.inject(DateAdapter);
59-
6058
}));
6159

6260
beforeEach(() => {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import * as moment from 'moment';
1717
}
1818
]
1919
})
20+
2021
export class InputDateComponent implements ControlValueAccessor {
2122
value: string;
2223
isDisabled: boolean;

src/environments/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
export const environment = {
66
production: false,
7-
timeTrackerApiUrl: 'https://0390-2800-4f0-546-4680-b5ef-416e-decc-9774.ngrok.io/api',
7+
timeTrackerApiUrl: 'http://localhost:7071/api',
88
stackexchangeApiUrl: 'https://api.stackexchange.com',
99
};
1010

0 commit comments

Comments
 (0)