kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-13 16:00:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix for #172

Browse Source
This commit is contained in:
James Cole
2016-02-06 04:32:30 +01:00
parent 7fa93e97db
commit 388d141d82
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Helpers/Report/ReportHelper.php
View File

@@ -178,10 +178,13 @@ class ReportHelper implements ReportHelperInterface
/** @var FiscalHelperInterface $fiscalHelper */ /** @var FiscalHelperInterface $fiscalHelper */
$fiscalHelper = app('FireflyIII\Helpers\FiscalHelperInterface'); $fiscalHelper = app('FireflyIII\Helpers\FiscalHelperInterface');
$start = clone $date; $start = clone $date;
$end = Carbon::now(); $start->startOfMonth();
$months = []; $end = Carbon::now();
$end->endOfMonth();
$months = [];
while ($start <= $end) { while ($start <= $end) {
// current year:
$year = $fiscalHelper->endOfFiscalYear($start)->year; $year = $fiscalHelper->endOfFiscalYear($start)->year;
if (!isset($months[$year])) { if (!isset($months[$year])) {
@@ -196,6 +199,7 @@ class ReportHelper implements ReportHelperInterface
$currentEnd = clone $start; $currentEnd = clone $start;
$currentEnd->endOfMonth(); $currentEnd->endOfMonth();
$months[$year]['months'][] = [ $months[$year]['months'][] = [
'formatted' => $start->formatLocalized('%B %Y'), 'formatted' => $start->formatLocalized('%B %Y'),
'start' => $start->format('Y-m-d'), 'start' => $start->format('Y-m-d'),
@@ -203,7 +207,10 @@ class ReportHelper implements ReportHelperInterface
'month' => $start->month, 'month' => $start->month,
'year' => $year, 'year' => $year,
]; ];
$start->addMonth();
// to make the hop to the next month properly:
$start = clone $currentEnd;
$start->addDay();
} }
return $months; return $months;

8
public/js/reports/index.js
View File

@@ -34,8 +34,8 @@ $(function () {
var startStr = readCookie('report-start'); var startStr = readCookie('report-start');
var endStr = readCookie('report-end'); var endStr = readCookie('report-end');
if (startStr !== null && endStr !== null && startStr.length == 8 && endStr.length == 8) { if (startStr !== null && endStr !== null && startStr.length == 8 && endStr.length == 8) {
var startDate = moment(startStr, "YYYYMMDD"); var startDate = moment(startStr, "YYYY-MM-DD");
var endDate = moment(endStr, "YYYYMMDD"); var endDate = moment(endStr, "YYYY-MM-DD");
var datePicker = $('#inputDateRange').data('daterangepicker'); var datePicker = $('#inputDateRange').data('daterangepicker');
datePicker.setStartDate(startDate); datePicker.setStartDate(startDate);
datePicker.setEndDate(endDate); datePicker.setEndDate(endDate);
@@ -87,8 +87,8 @@ function preSelectDate(e) {
"use strict"; "use strict";
var link = $(e.target); var link = $(e.target);
var picker = $('#inputDateRange').data('daterangepicker'); var picker = $('#inputDateRange').data('daterangepicker');
picker.setStartDate(link.data('start')); picker.setStartDate(moment(link.data('start'), "YYYY-MM-DD"));
picker.setEndDate(link.data('end')); picker.setEndDate(moment(link.data('end'), "YYYY-MM-DD"));
return false; return false;
} }