This commit is contained in:
James Cole 2018-12-30 15:44:33 +01:00
parent d736ffec8e
commit 0f83582fed
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 77 additions and 35 deletions

View File

@ -47,4 +47,14 @@ function presentSearchResults(data) {
$('.select_all_single').unbind('change').change(function () { $('.select_all_single').unbind('change').change(function () {
countChecked(); countChecked();
}); });
// make sure select button works:
$('input[name="select_all"]').change(function () {
if (this.checked) {
checkAll();
countChecked();
} else {
uncheckAll();
countChecked();
}
});
} }

View File

@ -153,6 +153,7 @@ function countChecked() {
*/ */
function checkAll() { function checkAll() {
"use strict"; "use strict";
console.log('Now in CheckAll((');
$('.select_all_single').prop('checked', true); $('.select_all_single').prop('checked', true);
} }
@ -207,6 +208,7 @@ function stopMassSelect() {
*/ */
function startMassSelect() { function startMassSelect() {
"use strict"; "use strict";
console.log('Now in startMassSelect()');
// show "select all" box in table header. // show "select all" box in table header.
$('.select_boxes').show(); $('.select_boxes').show();

View File

@ -71,8 +71,8 @@
</td> </td>
{% endif %} {% endif %}
<td class="hidden-xs pull-right"> <td class="hidden-xs">
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs pull-right">
{% if sorting %}<a href="#" class="handle btn btn-default"><i class="fa fa-fw fa-arrows-v"></i></a>{% endif %} {% if sorting %}<a href="#" class="handle btn btn-default"><i class="fa fa-fw fa-arrows-v"></i></a>{% endif %}
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">

View File

@ -1,76 +1,106 @@
<table class="table table-hover table-condensed"> <table class="table table-hover table-condensed">
<thead> <thead>
<tr class="ignore"> <tr class="ignore">
<th class="hidden-xs" colspan="2">&nbsp;</th> {# hidden row for checkboxes #}
<th class="hidden-xs select_boxes" style="display: none;"><input name="select_all" class="select_all" type="checkbox"/></th>
{# header for icon #}
<th class="hidden-xs"></th>
<th>{{ trans('list.description') }}</th> <th>{{ trans('list.description') }}</th>
<th>{{ trans('list.amount') }}</th> <th style="text-align:right;">{{ trans('list.amount') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.date') }}</th> <th class="hidden-xs hidden-sm">{{ trans('list.date') }}</th>
<th class="hidden-xs">{{ trans('list.from') }}</th> <th class="hidden-xs hidden-sm hidden-md">{{ trans('list.from') }}</th>
<th class="hidden-xs">{{ trans('list.to') }}</th> <th class="hidden-xs hidden-sm hidden-md">{{ trans('list.to') }}</th>
<th class="hidden-xs"><i class="fa fa-tasks fa-fw" title="{{ trans('list.budget') }}"></i></th> <th class="hidden-xs"><i class="fa fa-tasks fa-fw" title="{{ trans('list.budget') }}"></i></th>
<th class="hidden-xs"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th> <th class="hidden-xs"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
<th class="hidden-xs"><i class="fa fa-fw fa-rotate-right" title="{{ trans('list.bill') }}"></i></th> <th class="hidden-xs"><i class="fa fa-fw fa-calendar-o" title="{{ trans('list.bill') }}"></i></th>
{# visible row for edit/delete buttons #}
<th class="hidden-xs no_select_boxes">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for transaction in transactions %} {% for transaction in transactions %}
<tr> <tr data-date="{{ transaction.date.format('Y-m-d') }}" data-id="{{ transaction.journal_id }}" data-transaction-id="{{ transaction.id }}">
<td class="hidden-xs"> {# select buttons #}
<td class="hidden-xs select_boxes" style="display: none;">
<div class="select_single" style="display:none;"> <div class="select_single" style="display:none;">
<input name="select_all_single[]" class="select_all_single" value="{{ transaction.journal_id }}" type="checkbox"/> <input name="select_all_single[]" class="select_all_single" data-transaction="{{ transaction.id }}" value="{{ transaction.journal_id }}"
type="checkbox"/>
</div> </div>
<div class="btn-group btn-group-xs edit_buttons edit_tr_buttons">
<a href="{{ route('transactions.edit',transaction.journal_id) }}" class="btn btn-xs btn-default"><i
class="fa fa-fw fa-pencil"></i></a>
<a href="{{ route('transactions.delete',transaction.journal_id) }}" class="btn btn-xs btn-danger"><i
class="fa fa-fw fa-trash-o"></i></a></div>
</td> </td>
{# icon #}
<td class="hidden-xs"> <td class="hidden-xs">
{{ transaction|transactionIcon }} {{ transaction|transactionIcon }}
</td> </td>
<td>
<a href="{{ route('transactions.show',transaction.journal_id) }}">
{% if transaction.transaction_description|length > 0 %} {# description #}
{{ transaction.transaction_description }} ({{ transaction.description }}) <td>
{% else %} {# is reconciled? #}
{{ transaction.description }} {{ transaction|transactionReconciled }}
{% endif %}
<a href="{{ route('transactions.show',transaction.journal_id) }}">
{{ transaction|transactionDescription }}
</a> </a>
{# is a split journal #}
{{ transaction|transactionIsSplit }} {{ transaction|transactionIsSplit }}
{% if transaction.transactionJournal.attachments|length > 0 %} {# count attachments #}
<i class="fa fa-paperclip" {{ transaction|transactionHasAtt }}
title="{{ Lang.choice('firefly.nr_of_attachments', journal.attachments|length, {count: journal.attachments|length}) }}"></i>
{% endif %}
</td>
<td style="text-align: right;">
<span style="margin-right:5px;">
{{ transaction|transactionAmount }}
</span>
</td> </td>
{# amount #}
<td style="text-align: right;"><span style="margin-right:5px;">{{ transaction|transactionAmount }}</span></td>
{# date #}
<td class="hidden-sm hidden-xs"> <td class="hidden-sm hidden-xs">
{{ transaction.date.formatLocalized(monthAndDayFormat) }} {{ transaction.date.formatLocalized(monthAndDayFormat) }}
</td> </td>
<td class="hidden-xs"> {# source #}
<td class="hidden-xs hidden-sm hidden-md">
{{ transaction|transactionSourceAccount }} {{ transaction|transactionSourceAccount }}
</td> </td>
<td class="hidden-xs"> {# dest #}
<td class="hidden-xs hidden-sm hidden-md">
{{ transaction|transactionDestinationAccount }} {{ transaction|transactionDestinationAccount }}
</td> </td>
{# budget, if opted to show. #}
<td class="hidden-xs"> <td class="hidden-xs">
{{ transaction|transactionBudgets }} {{ transaction|transactionBudgets }}
</td> </td>
{# category, if opted to show. #}
<td class="hidden-xs"> <td class="hidden-xs">
{{ transaction|transactionCategories }} {{ transaction|transactionCategories }}
</td> </td>
{# bill, if opted to show#}
<td class="hidden-xs"> <td class="hidden-xs">
{% if transaction.bill_id %} {% if transaction.bill_id %}
<a href="{{ route('bills.show',transaction.bill_id) }}">{{ transaction.bill_name }}</a> <a href="{{ route('bills.show',transaction.bill_id) }}">{{ transaction.bill_name }}</a>
{% endif %} {% endif %}
</td> </td>
<td class="hidden-xs">
<div class="btn-group btn-group-xs pull-right">
{% if sorting %}<a href="#" class="handle btn btn-default"><i class="fa fa-fw fa-arrows-v"></i></a>{% endif %}
<div class="btn-group btn-group-xs">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ 'actions'|_ }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('transactions.edit',transaction.journal_id) }}"><i class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete',transaction.journal_id) }}"><i class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li>
<li role="separator" class="divider"></li>
<li><a href="{{ route('transactions.clone',transaction.journal_id) }}"><i class="fa fa-copy fa-fw"></i> {{ 'clone'|_ }}</a></li>
<li><a href="{{ route('transactions.split.edit',transaction.journal_id) }}"><i class="fa fa-unsorted fa-fw"></i> {{ 'split'|_ }}</a>
</li>
</ul>
</div>
</div>
</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>