Skip to content

Firefly III: a personal finances manager

Fix report date selection.

James Cole02aa504b906f
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index b8b78ff12a..e49494381e 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -290,6 +290,7 @@ final class ReportController extends Controller
*/
public function postIndex(ReportFormRequest $request): RedirectResponse|View
{
+
// report type:
$reportType = $request->input('report_type');
$start = $request->getStartDate()->format('Ymd');
diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php
index b4384a8636..0057db3610 100644
--- a/app/Http/Requests/ReportFormRequest.php
+++ b/app/Http/Requests/ReportFormRequest.php
@@ -36,7 +36,6 @@ use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use Safe\Exceptions\PcreException;
-
use function Safe\preg_match;
/**
@@ -60,7 +59,7 @@ class ReportFormRequest extends FormRequest
$collection = new Collection();
if (is_array($set)) {
foreach ($set as $accountId) {
- $account = $repository->find((int) $accountId);
+ $account = $repository->find((int)$accountId);
if (null !== $account) {
$collection->push($account);
}
@@ -81,7 +80,7 @@ class ReportFormRequest extends FormRequest
$collection = new Collection();
if (is_array($set)) {
foreach ($set as $budgetId) {
- $budget = $repository->find((int) $budgetId);
+ $budget = $repository->find((int)$budgetId);
if (null !== $budget) {
$collection->push($budget);
}
@@ -102,7 +101,7 @@ class ReportFormRequest extends FormRequest
$collection = new Collection();
if (is_array($set)) {
foreach ($set as $categoryId) {
- $category = $repository->find((int) $categoryId);
+ $category = $repository->find((int)$categoryId);
if (null !== $category) {
$collection->push($category);
}
@@ -123,7 +122,7 @@ class ReportFormRequest extends FormRequest
$collection = new Collection();
if (is_array($set)) {
foreach ($set as $accountId) {
- $account = $repository->find((int) $accountId);
+ $account = $repository->find((int)$accountId);
if (null !== $account) {
$collection->push($account);
}
@@ -141,32 +140,24 @@ class ReportFormRequest extends FormRequest
*/
public function getEndDate(): Carbon
{
- $date = today(config('app.timezone'));
- $range = $this->get('daterange');
- $parts = explode(' - ', (string) $range);
- if (2 === count($parts)) {
- $string = $parts[1];
- // validate as date
- // if regex for YYYY-MM-DD:
- $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
- $result = preg_match($pattern, $string);
- if (0 !== $result) {
- try {
- $date = new Carbon($parts[1]);
- } catch (Exception $e) { // intentional generic exception
- $error = sprintf('"%s" is not a valid date range: %s', $range, $e->getMessage());
- Log::error($error);
- Log::error($e->getTraceAsString());
-
- throw new FireflyException($error, 0, $e);
- }
-
- return $date;
+ $date = today(config('app.timezone'));
+ $end = $this->input('end');
+ // validate as date
+ // if regex for YYYY-MM-DD:
+ $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
+ $result = preg_match($pattern, $end);
+ if (0 !== $result) {
+ try {
+ $date = new Carbon($end);
+ } catch (Exception $e) { // intentional generic exception
+ $error = sprintf('"%s" is not a valid end: %s', $end, $e->getMessage());
+ Log::error($error);
+ Log::error($e->getTraceAsString());
+
+ throw new FireflyException($error, 0, $e);
}
- $error = sprintf('"%s" is not a valid date range: %s', $range, 'invalid format :(');
- Log::error($error);
- throw new FireflyException($error, 0);
+ return $date;
}
return $date;
@@ -181,31 +172,23 @@ class ReportFormRequest extends FormRequest
public function getStartDate(): Carbon
{
$date = today(config('app.timezone'));
- $range = $this->get('daterange');
- $parts = explode(' - ', (string) $range);
- if (2 === count($parts)) {
- $string = $parts[0];
- // validate as date
- // if regex for YYYY-MM-DD:
- $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
- $result = preg_match($pattern, $string);
- if (0 !== $result) {
- try {
- $date = new Carbon($parts[0]);
- } catch (Exception $e) { // intentional generic exception
- $error = sprintf('"%s" is not a valid date range: %s', $range, $e->getMessage());
- Log::error($error);
- Log::error($e->getTraceAsString());
-
- throw new FireflyException($error, 0, $e);
- }
-
- return $date;
+ $start = $this->input('start');
+ // validate as date
+ // if regex for YYYY-MM-DD:
+ $pattern = '/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][\d]|3[01])$/';
+ $result = preg_match($pattern, $start);
+ if (0 !== $result) {
+ try {
+ $date = new Carbon($start);
+ } catch (Exception $e) { // intentional generic exception
+ $error = sprintf('"%s" is not a valid date range: %s', $start, $e->getMessage());
+ Log::error($error);
+ Log::error($e->getTraceAsString());
+
+ throw new FireflyException($error, 0, $e);
}
- $error = sprintf('"%s" is not a valid date range: %s', $range, 'invalid format :(');
- Log::error($error);
- throw new FireflyException($error, 0);
+ return $date;
}
return $date;
@@ -236,7 +219,7 @@ class ReportFormRequest extends FormRequest
continue;
}
- $tag = $repository->find((int) $tagTag);
+ $tag = $repository->find((int)$tagTag);
if (null !== $tag) {
$collection->push($tag);
}
diff --git a/config/intro.php b/config/intro.php
index c8a260b026..3c410171ff 100644
--- a/config/intro.php
+++ b/config/intro.php
@@ -37,13 +37,13 @@ return [
],
// accounts: create
'accounts_create' => [
- 'iban' => ['element' => '#ffInput_iban'],
+ 'iban' => ['element' => '#ffInput_iban', 'position' => 'bottom'],
],
// transactions: create
'transactions_create' => [
- 'basic_info' => ['element' => '#transaction-info', 'position' => 'right'],
- 'amount_info' => ['element' => '#amount-info', 'position' => 'bottom'],
- 'optional_info' => ['element' => '#optional-info', 'position' => 'left'],
+ 'basic_info' => ['element' => '.transaction-info', 'position' => 'right'],
+ 'amount_info' => ['element' => '.amount-info', 'position' => 'bottom'],
+ 'optional_info' => ['element' => '.optional-info', 'position' => 'left'],
'split' => ['element' => '.split_add_btn', 'position' => 'top'],
],
@@ -63,10 +63,9 @@ return [
// budgets: index
'budgets_index' => [
'intro' => [],
- 'see_expenses_bar' => ['element' => '#spentBar'],
- 'navigate_periods' => ['element' => '#periodNavigator'],
- 'new_budget' => ['element' => '#createBudgetBox'],
- 'list_of_budgets' => ['element' => '#budgetList'],
+ 'see_expenses_bar' => ['element' => '.spent_bar', 'position' => 'bottom'],
+ 'navigate_periods' => ['element' => '#periodNavigator', 'position' => 'bottom'],
+ 'list_of_budgets' => ['element' => '#budgetList', 'position' => 'bottom'],
'outro' => [],
],
// reports: index, default report, audit, budget, cat, tag
diff --git a/public/v1/js/ff/reports/all.js b/public/v1/js/ff/reports/all.js
index 49cf3bf63e..a3566f1138 100644
--- a/public/v1/js/ff/reports/all.js
+++ b/public/v1/js/ff/reports/all.js
@@ -42,7 +42,7 @@ function createCookie(name, value, days) {
if (days) {
var date = new Date();
date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
- expires = "; expires=" + date.toGMTString();
+ expires = "; expires=" + date.toUTCString();
} else {
expires = "";
}
diff --git a/public/v1/js/ff/reports/index.js b/public/v1/js/ff/reports/index.js
index db32ec7fca..cdddd713c4 100644
--- a/public/v1/js/ff/reports/index.js
+++ b/public/v1/js/ff/reports/index.js
@@ -34,52 +34,41 @@ var defaultMultiSelect = {
$(function () {
"use strict";
+ // set report type from cookie, if any:
+ if (null !== readCookie('report-type')) {
+ $('select[name="report_type"]').val(readCookie('report-type'));
+ }
- if ($('#inputDateRange').length > 0) {
-
- $('#inputDateRange').daterangepicker(
- {
- locale: {
- format: 'YYYY-MM-DD',
- firstDay: 1
- },
- format: 'YYYY-MM-DD',
- minDate: minDate,
- drops: 'down'
- }
- );
-
- // set report type from cookie, if any:
- if (null !== readCookie('report-type')) {
- $('select[name="report_type"]').val(readCookie('report-type'));
- }
-
- // set accounts from cookie
- if ((readCookie('report-accounts') !== null)) {
- var arr = readCookie('report-accounts').split(',');
- arr.forEach(function (val) {
- $('#inputAccounts').find('option[value="' + val + '"]').prop('selected', true);
- });
- }
-
- // make account select a hip new bootstrap multi-select thing.
- //$('#inputAccounts').multiselect(defaultMultiSelect);
-
- // set date from cookie
- var startStr = readCookie('report-start');
- var endStr = readCookie('report-end');
- if (startStr !== null && endStr !== null && startStr.length === 8 && endStr.length === 8) {
- var startDate = moment(startStr, "YYYY-MM-DD");
- var endDate = moment(endStr, "YYYY-MM-DD");
- var datePicker = $('#inputDateRange').data('daterangepicker');
- datePicker.setStartDate(startDate);
- datePicker.setEndDate(endDate);
- }
+ // set accounts from cookie, if any
+ if ((readCookie('report-accounts') !== null)) {
+ var arr = readCookie('report-accounts').split(',');
+ arr.forEach(function (val) {
+ $('#inputAccounts').find('option[value="' + val + '"]').prop('selected', true);
+ });
}
+ // set date from cookie, if any.
+ var startStr = readCookie('report-start');
+ var endStr = readCookie('report-end');
+ if (startStr !== null && endStr !== null && startStr.length === 8 && endStr.length === 8) {
+ var startDate = moment(startStr, "YYYY-MM-DD").format('YYYY-MM-DD');
+ var endDate = moment(endStr, "YYYY-MM-DD").format('YYYY-MM-DD');
+ console.log('start date',startDate);
+ console.log('start date',endDate);
+
+ document.getElementById('dateRange-start').value = startDate;
+ document.getElementById('dateRange-end').value = endDate;
+ }
+
+ // pre-select dates
$('.date-select').on('click', preSelectDate);
+
+ // submit form
$('#report-form').on('submit', catchSubmit);
+
+ // get report options.
$('select[name="report_type"]').on('change', getReportOptions);
+
getReportOptions();
});
@@ -104,6 +93,7 @@ function getReportOptions() {
function setOptionalFromCookies() {
var arr;
+
// categories
if ((readCookie('report-categories') !== null)) {
arr = readCookie('report-categories').split(',');
@@ -111,7 +101,6 @@ function setOptionalFromCookies() {
$('#inputCategories').find('option[value="' + encodeURI(val) + '"]').prop('selected', true);
});
}
- $('#inputCategories').multiselect(defaultMultiSelect);
// and budgets!
if ((readCookie('report-budgets') !== null)) {
@@ -120,7 +109,6 @@ function setOptionalFromCookies() {
$('#inputBudgets').find('option[value="' + encodeURI(val) + '"]').prop('selected', true);
});
}
- $('#inputBudgets').multiselect(defaultMultiSelect);
// and tags!
if ((readCookie('report-tags') !== null)) {
@@ -129,7 +117,6 @@ function setOptionalFromCookies() {
$('#inputTags').find('option[value="' + encodeURI(val) + '"]').prop('selected', true);
});
}
- $('#inputTags').multiselect(defaultMultiSelect);
// and expense/revenue thing
if ((readCookie('report-double') !== null)) {
@@ -138,15 +125,11 @@ function setOptionalFromCookies() {
$('#inputDoubleAccounts').find('option[value="' + encodeURI(val) + '"]').prop('selected', true);
});
}
- $('#inputDoubleAccounts').multiselect(defaultMultiSelect);
-
-
}
function catchSubmit() {
"use strict";
// date, processed:
- var picker = $('#inputDateRange').data('daterangepicker');
// all account ids:
var accounts = $('#inputAccounts').val();
@@ -163,23 +146,20 @@ function catchSubmit() {
createCookie('report-budgets', budgets, 365);
createCookie('report-tags', tags, 365);
createCookie('report-double', double, 365);
- createCookie('report-start', moment(picker.startDate).format("YYYYMMDD"), 365);
- createCookie('report-end', moment(picker.endDate).format("YYYYMMDD"), 365);
+ createCookie('report-start', moment(document.getElementById('dateRange-start').value).format("YYYYMMDD"), 365);
+ createCookie('report-end', moment(document.getElementById('dateRange-end').value).format("YYYYMMDD"), 365);
return true;
}
function preSelectDate(e) {
"use strict";
- var link = $(e.target);
- var picker = $('#inputDateRange').data('daterangepicker');
+ let link = $(e.currentTarget);
var startMoment= moment(link.data('start'), "Y-MM-DD");
var endMoment= moment(link.data('end'), "Y-MM-DD");
-
- picker.setStartDate(startMoment);
- picker.setEndDate(endMoment);
+ document.getElementById('dateRange-start').value = startMoment.format("YYYY-MM-DD");
+ document.getElementById('dateRange-end').value = endMoment.format("YYYY-MM-DD");
return false;
-
}
diff --git a/resources/assets/v3/js/boot/bootstrap.js b/resources/assets/v3/js/boot/bootstrap.js
index 908622f977..29da20f12d 100644
--- a/resources/assets/v3/js/boot/bootstrap.js
+++ b/resources/assets/v3/js/boot/bootstrap.js
@@ -78,7 +78,6 @@ getFreshVariable('lastActivity').then((serverValue) => {
// page may have an introduction necessary to be played.
if (!window.showTour) {
- console.log('Will not show introduction tour for this page');
return;
}
const url = '/';
diff --git a/resources/assets/v3/js/support/load-translations.js b/resources/assets/v3/js/support/load-translations.js
index 92010ac616..a044729a60 100644
--- a/resources/assets/v3/js/support/load-translations.js
+++ b/resources/assets/v3/js/support/load-translations.js
@@ -29,6 +29,7 @@ let loaded = false;
function loadTranslations(locale) {
// console.log('loadTranslations(' + locale + ')');
if (false === loaded) {
+ console.log('Not yet loaded');
const replacedLocale = locale.replace('-', '_');
loaded = true;
const expireTime = import.meta.env.MODE === 'development' ? 1 : 7 * 24 * 60 * 60 * 1000;
diff --git a/resources/views/components/transaction/split.blade.php b/resources/views/components/transaction/split.blade.php
index dcc8f3d2f6..bec5b3ad10 100644
--- a/resources/views/components/transaction/split.blade.php
+++ b/resources/views/components/transaction/split.blade.php
@@ -7,7 +7,7 @@
<div class="card-header">
<h3 class="card-title">{{ __('firefly.basic_journal_information') }}</h3>
</div>
- <div class="card-body">
+ <div class="card-body transaction-info">
<!-- GROUP TITLE -->
@include('partials.form.transaction.group-title')
<!-- DESCRIPTION -->
@@ -30,7 +30,7 @@
<div class="col-xl-6 col-lg-6 col-md-12 col-xs-12 mb-2">
<!-- AMOUNTS -->
- <div class="card mb-2">
+ <div class="card mb-2 amount-info">
<div class="card-header">
<h3 class="card-title">
{{ __('firefly.transaction_journal_amount') }}
@@ -53,7 +53,7 @@
{{ __('firefly.transaction_journal_meta') }}
</h3>
</div>
- <div class="card-body">
+ <div class="card-body optional-info">
<!-- BUDGET -->
@include('partials.form.transaction.budget')
diff --git a/resources/views/components/transaction/tab-list.blade.php b/resources/views/components/transaction/tab-list.blade.php
index 95fe544fbd..22cddd29f8 100644
--- a/resources/views/components/transaction/tab-list.blade.php
+++ b/resources/views/components/transaction/tab-list.blade.php
@@ -21,7 +21,7 @@
</button>
</li>
</template>
- <li class="nav-item" role="presentation">
+ <li class="nav-item split_add_btn" role="presentation">
<button class="nav-link" type="button" role="tab" @click="addSplit()"><em class="bi bi-plus-circle"></em></button>
</li>
<li class="nav-item">
diff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.php
index 7b0da03714..f484c00cae 100644
--- a/resources/views/reports/index.blade.php
+++ b/resources/views/reports/index.blade.php
@@ -44,9 +44,14 @@
<div class="row mb-3">
<label for="inputDateRange" class="col-sm-3 col-form-label">{{ __('firefly.report_date_range') }}</label>
- <div class="col-sm-9">
- <input autocomplete="off" type="text" class="form-control" id="inputDateRange" name="daterange"
- value="{{ session('start')->format('Y-m-d') }} - {{ session('end')->format('Y-m-d') }}">
+ <div class="col-sm-4">
+ <input type="date" value="{{ session('start')->format('Y-m-d') }}" class="date-select form-control" name="start" id="dateRange-start" />
+ </div>
+ <div class="col-sm-1">
+ &nbsp;
+ </div>
+ <div class="col-sm-4">
+ <input type="date" value="{{ session('end')->format('Y-m-d') }}" class="date-select form-control" name="end" id="dateRange-end" />
</div>
</div>
<div class="row mb-3">
@@ -55,12 +60,12 @@
<div class="col-sm-9">
@foreach($months as $year => $data)
<a href="#" class="date-select" data-start="{{ $data['start'] }}" data-end="{{ $data['end'] }}">{{ $year }}</a>
- @if(1 === $customFiscalYear)
+ @if(1 === $customFiscalYear || true === $customFiscalYear)
<br/>
<a href="#" class="date-select" data-start="{{ $data['fiscal_start'] }}" data-end="{{ $data['fiscal_end'] }}">{{ $year }}
({{ __('firefly.fiscal_year') }})</a>
@endif
- @if(0 === $customFiscalYear)
+ @if(0 === $customFiscalYear || false === $customFiscalYear)
(<a href="#" class="date-select" data-start="{{ $year }}-01-01" data-end="{{ $year }}-03-31">Q1</a>,
<a href="#" class="date-select" data-start="{{ $year }}-04-01" data-end="{{ $year }}-06-30">Q2</a>,
<a href="#" class="date-select" data-start="{{ $year }}-07-01" data-end="{{ $year }}-09-30">Q3</a>,
@@ -178,7 +183,7 @@
@endsection
@section('scripts')
- @vite(['js/pages/generic.js'])
+ @vite(['js/pages/generic-nodates.js'])
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var minDate = "{{ $start->format('Y-m-d') }}";
var picker;
@@ -188,8 +193,6 @@
var allSelectedText = "{{ escape_for_js(trans('firefly.multi_select_all_selected')) }}";
var filterPlaceholder = "{{ escape_for_js(trans('firefly.multi_select_filter_placeholder')) }}";
</script>
- <script type="text/javascript" src="v1/js/lib/daterangepicker.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
- <script type="text/javascript" src="v1/js/lib/bootstrap-multiselect.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/reports/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
@endsection