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

Clean up code after changing routes.

Browse Source
This commit is contained in:
James Cole
2016-12-06 07:48:41 +01:00
parent 02257e3887
commit d8f291be6e
15 changed files with 138 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/accounts/edit.twig
View File

@@ -77,7 +77,3 @@
</div>
{{ Form.close|raw }}
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/ff/accounts/create-edit.js"></script>
{% endblock %}

5
resources/views/categories/show-by-date.twig
View File

@@ -40,12 +40,11 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript">
var categoryID = {{ category.id }};
var categoryDate = "{{ carbon.format('Y-m-d') }}";
var specific = '{{ route('chart.category.specific', [category.id, carbon.format('Ymd')]) }}';
</script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/ff/categories/show_with_date.js"></script>
<script type="text/javascript" src="js/ff/categories/show-by-date.js"></script>
<script type="text/javascript" src="js/ff/transactions/list.js"></script>
{% endblock %}

3
resources/views/categories/show.twig
View File

@@ -73,7 +73,8 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript">
var categoryID = {{ category.id }};
var current = '{{ route('chart.category.current', [category.id]) }}';
var all = '{{ route('chart.category.all', [category.id]) }}';
</script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>

7
resources/views/reports/category/month.twig
View File

@@ -369,6 +369,13 @@
var endDate = '{{ end.format('Ymd') }}';
var accountIds = '{{ accountIds }}';
var categoryIds = '{{ categoryIds }}';
// chart uri's
var categoryIncomeUri = '{{ route('chart.category.category-income', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
var categoryExpenseUri = '{{ route('chart.category.category-expense', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
var accountIncomeUri = '{{ route('chart.category.account-income', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
var accountExpenseUri = '{{ route('chart.category.account-expense', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
var mainUri = '{{ route('chart.category.main', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';
</script>