cybercinch/openaccounting-web
0
0
Fork 1
mirror of https://github.com/openaccounting/oa-web.git synced 2025-12-09 09:01:24 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Patrick Nagurny
2019-06-17 14:37:10 -04:00
parent cf4c779628
commit ca871a8021
6 changed files with 143 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/reports/income.ts
View File

@@ -45,10 +45,9 @@ export class IncomeReport {
private configService: ConfigService,
private sessionService: SessionService) {
this.startDate = new Date();
this.startDate.setDate(1);
this.startDate.setHours(0, 0, 0, 0);
this.endDate = new Date(this.startDate);
this.endDate.setMonth(this.startDate.getMonth() + 1);
Util.setFirstOfMonth(this.startDate);
Util.setBeginOfDay(this.startDate);
this.endDate = Util.getOneMonthLater(this.startDate);
let reportData = this.configService.get('reportData');
@@ -65,7 +64,7 @@ export class IncomeReport {
this.form = fb.group({
startDate: [Util.getLocalDateString(this.startDate), Validators.required],
endDate: [Util.getLocalDateString(new Date(this.endDate.getTime() - 1)), Validators.required]
endDate: [Util.getLocalDateStringExcl(this.endDate), Validators.required]
});
}
@@ -92,8 +91,7 @@ export class IncomeReport {
//this.dataService.setLoading(true);
this.showDateForm = false;
this.startDate = Util.getDateFromLocalDateString(this.form.value.startDate);
this.endDate = Util.getDateFromLocalDateString(this.form.value.endDate);
this.endDate.setDate(this.endDate.getDate() + 1);
this.endDate = Util.getDateFromLocalDateStringExcl(this.form.value.endDate);
let reportData = this.configService.get('reportData');