Skip to content

Firefly III: a personal finances manager

Fix date selection.

James Coleddcb6128faba
diff --git a/resources/assets/v3/js/pages/dashboard/boxes.js b/resources/assets/v3/js/pages/dashboard/boxes.js
index 901948e844..a1a7d17c73 100644
--- a/resources/assets/v3/js/pages/dashboard/boxes.js
+++ b/resources/assets/v3/js/pages/dashboard/boxes.js
@@ -70,6 +70,8 @@ export default () => ({
this.boxData = response.data;
window.store.set(boxesCacheKey, response.data);
this.generateOptions(this.boxData);
+ }).catch((error) => {
+ console.error('Request gave error.');
});
},
generateOptions(data) {
diff --git a/resources/assets/v3/js/pages/shared/dates.js b/resources/assets/v3/js/pages/shared/dates.js
index 13076b6778..1b6498839f 100644
--- a/resources/assets/v3/js/pages/shared/dates.js
+++ b/resources/assets/v3/js/pages/shared/dates.js
@@ -35,19 +35,25 @@ export default () => ({
console.log('updateDates (e.originalTarget._props.value)');
console.log(e.originalTarget._props.value);
let split = e.originalTarget._props.value.split('/');
- document.getElementById('customStart').value = split[0];
- document.getElementById('customEnd').value = split[1];
// this.range.start = split[0];
// this.range.end = split[1];
console.log('Start is now ' + split[0]);
console.log('End is now ' + split[1]);
window.store.set('start', split[0]);
window.store.set('end', split[1]);
- document.getElementById('daterange-form').submit();
+ this.submitForm();
+
},
defaultRange: {
start: null, end: null
},
+ submitForm() {
+ console.log('submitForm');
+ // save form and submit for v1.
+ document.getElementById('customStart').value = window.store.get('start');
+ document.getElementById('customEnd').value = window.store.get('end');
+ document.getElementById('daterange-form').submit();
+ },
language: 'en_US',
init() {
@@ -71,7 +77,7 @@ export default () => ({
});
window.store.observe('end', (newValue) => {
this.range.end = new Date(newValue);
- this.buildDateRange();
+ this.buildDateRange();
});
},
@@ -184,6 +190,7 @@ export default () => ({
},
changeDateRange(e) {
+ console.log('changeDateRange');
e.preventDefault();
// console.log('MainApp: changeDateRange');
let target = e.currentTarget;
@@ -194,7 +201,7 @@ export default () => ({
window.store.set('start', start);
window.store.set('end', end);
- //this.buildDateRange();
+ this.submitForm();
return false;
},
diff --git a/resources/views/components/layout/range.blade.php b/resources/views/components/layout/range.blade.php
index dbb325850e..dbdef1115b 100644
--- a/resources/views/components/layout/range.blade.php
+++ b/resources/views/components/layout/range.blade.php
@@ -10,6 +10,7 @@
<span class="daterange-holder"></span>
</a>
<ul
+ x-data="dates" x-bind="eventListeners"
class="dropdown-menu"
aria-labelledby="date-range"
style="--bs-dropdown-min-width: 8rem"
diff --git a/resources/views/layout/v3/session.blade.php b/resources/views/layout/v3/session.blade.php
index 3407f2b4ed..9373c53321 100644
--- a/resources/views/layout/v3/session.blade.php
+++ b/resources/views/layout/v3/session.blade.php
@@ -386,8 +386,6 @@
{{-- date range picker, current template, etc. --}}
-<script src="v1/js/lib/daterangepicker.js?v={{ $FF_BUILD_TIME }}" type="text/javascript"
- nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/accounting.min.js?v={{ $FF_BUILD_TIME }}"
nonce="{{ $JS_NONCE }}"></script>
@@ -492,8 +490,7 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
</form>
-<div class="modal fade" tabindex="-1" role="dialog" id="customDateRangeModal" aria-hidden="true" x-data="dates"
- x-bind="eventListeners">
+<div class="modal fade" tabindex="-1" role="dialog" id="customDateRangeModal" aria-hidden="true">
<div class="modal-dialog modal-lg">
<form action="{{ route('daterange') }}?redirect=true" method="POST" id="daterange-form">
<input type="hidden" name="start" value="" id="customStart"/>