diff --git a/public/v1/js/ff/search/index.js b/public/v1/js/ff/search/index.js index 70615ae476..c7ccc645ef 100644 --- a/public/v1/js/ff/search/index.js +++ b/public/v1/js/ff/search/index.js @@ -47,4 +47,14 @@ function presentSearchResults(data) { $('.select_all_single').unbind('change').change(function () { countChecked(); }); + // make sure select button works: + $('input[name="select_all"]').change(function () { + if (this.checked) { + checkAll(); + countChecked(); + } else { + uncheckAll(); + countChecked(); + } + }); } \ No newline at end of file diff --git a/public/v1/js/ff/transactions/list.js b/public/v1/js/ff/transactions/list.js index bed2fceeb5..46bb3639ef 100644 --- a/public/v1/js/ff/transactions/list.js +++ b/public/v1/js/ff/transactions/list.js @@ -153,6 +153,7 @@ function countChecked() { */ function checkAll() { "use strict"; + console.log('Now in CheckAll(('); $('.select_all_single').prop('checked', true); } @@ -207,6 +208,7 @@ function stopMassSelect() { */ function startMassSelect() { "use strict"; + console.log('Now in startMassSelect()'); // show "select all" box in table header. $('.select_boxes').show(); diff --git a/resources/views/v1/partials/transaction-row.twig b/resources/views/v1/partials/transaction-row.twig index cc7101a1f6..223bb6eb07 100644 --- a/resources/views/v1/partials/transaction-row.twig +++ b/resources/views/v1/partials/transaction-row.twig @@ -71,8 +71,8 @@ {% endif %} -
+ {# hidden row for checkboxes #} + + + {# header for icon #} + | {{ trans('list.description') }} | -{{ trans('list.amount') }} | - -{{ trans('list.from') }} | -{{ trans('list.to') }} | +{{ trans('list.amount') }} | + + +- | + | + {# visible row for edit/delete buttons #} + | ||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
+ | ||||||||||||
{{ transaction|transactionIcon }} | -- - {% if transaction.transaction_description|length > 0 %} - {{ transaction.transaction_description }} ({{ transaction.description }}) - {% else %} - {{ transaction.description }} - {% endif %} + {# description #} + | + {# is reconciled? #} + {{ transaction|transactionReconciled }} + + + {{ transaction|transactionDescription }} + {# is a split journal #} {{ transaction|transactionIsSplit }} - {% if transaction.transactionJournal.attachments|length > 0 %} - - {% endif %} - | -- - {{ transaction|transactionAmount }} - + {# count attachments #} + {{ transaction|transactionHasAtt }} + | + + {# amount #} +{{ transaction|transactionAmount }} | + + {# date #} -+ {# source #} + | -+ {# dest #} + | + + {# budget, if opted to show. #}{{ transaction|transactionBudgets }} | + + {# category, if opted to show. #}{{ transaction|transactionCategories }} | + + {# bill, if opted to show#}{% if transaction.bill_id %} {{ transaction.bill_name }} {% endif %} | + ++ + |