IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #1927

Browse Source
This commit is contained in:
James Cole 2018-12-29 21:57:24 +01:00
parent 9750bcba76
commit 354be8dc88
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/v1/js/ff/recurring/create.js vendored
View File

@ -40,10 +40,13 @@ $(document).ready(function () {
$('#ffInput_repetition_end').on('change', respondToRepetitionEnd);
$('#ffInput_first_date').on('change', respondToFirstDateChange);
// new date
var firstDate = $('#ffInput_first_date').val();
// create calendar on load:
calendar = $('#recurring_calendar').fullCalendar(
{
defaultDate: '2018-06-13',
defaultDate: firstDate,
editable: false,
height: 400,
width: 200,

5
public/v1/js/ff/recurring/edit.js vendored
View File

@ -40,10 +40,13 @@ $(document).ready(function () {
$('#ffInput_repetition_end').on('change', respondToRepetitionEnd);
$('#ffInput_first_date').on('change', respondToFirstDateChange);
// new date
var firstDate = $('#ffInput_first_date').val();
// create calendar on load:
calendar = $('#recurring_calendar').fullCalendar(
{
defaultDate: '2018-06-13',
defaultDate: firstDate,
editable: false,
height: 400,
width: 200,

1
resources/lang/en_US/firefly.php
View File

@ -1288,6 +1288,7 @@ return [
// recurring transactions
'recurrences' => 'Recurring transactions',
'recurring_calendar_view' => 'Calendar',
'no_recurring_title_default' => 'Let\'s create a recurring transaction!',
'no_recurring_intro_default' => 'You have no recurring transactions yet. You can use these to make Firefly III automatically create transactions for you.',
'no_recurring_imperative_default' => 'This is a pretty advanced feature but it can be extremely useful. Make sure you read the documentation (?)-icon in the top right corner) before you continue.',

2
resources/views/v1/recurring/create.twig
View File

@ -173,7 +173,7 @@
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Calendar view yay</h4>
<h4 class="modal-title">{{ 'recurring_calendar_view'|_ }}</h4>
</div>
<div class="modal-body">
<div id="recurring_calendar" style="max-width: 400px;margin: 0 auto;">

4
resources/views/v1/recurring/edit.twig
View File

@ -20,7 +20,7 @@
{{ ExpandedForm.text('title') }}
{{ ExpandedForm.date('first_date',array.first_date, {helpText: trans('firefly.help_first_date_no_past')}) }}
{{ ExpandedForm.select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }}
{{ ExpandedForm.number('skip', array.recurrence_repetitions[0].repetition_skip) }}
{{ ExpandedForm.number('skip', array.recurrence_repetitions[0].skip) }}
{{ ExpandedForm.select('weekend', weekendResponses, array.recurrence_repetitions[0].weekend, {helpText: trans('firefly.help_weekend')}) }}
{{ ExpandedForm.select('repetition_end', repetitionEnds, repetitionEnd) }}
{{ ExpandedForm.date('repeat_until',array.repeat_until) }}
@ -194,7 +194,7 @@
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Calendar view yay</h4>
<h4 class="modal-title">{{ 'recurring_calendar_view'|_ }}</h4>
</div>
<div class="modal-body">
<div id="recurring_calendar" style="max-width: 400px;margin: 0 auto;">