kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 08:11:20 +00:00
Code Issues Projects Releases Wiki Activity

Expand view with several new options. Move cache to api endpoints.

Browse Source
This commit is contained in:
James Cole
2024-04-28 13:30:42 +02:00
parent c1c0afa40b
commit 7992b810fd
10 changed files with 226 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repositories/UserGroups/Account/AccountRepository.php
View File

@@ -251,6 +251,7 @@ class AccountRepository implements AccountRepositoryInterface
// process filters // process filters
// TODO this should be repeatable, it feels like a hack when you do it here. // TODO this should be repeatable, it feels like a hack when you do it here.
// TODO some fields cannot be filtered using the query, and a second filter must be applied on the collection.
foreach($filters as $column => $value) { foreach($filters as $column => $value) {
// filter on NULL values // filter on NULL values
if(null === $value) { if(null === $value) {
@@ -259,6 +260,9 @@ class AccountRepository implements AccountRepositoryInterface
if ('active' === $column) { if ('active' === $column) {
$query->where('accounts.active', $value); $query->where('accounts.active', $value);
} }
if('name' === $column) {
$query->where('accounts.name', 'LIKE', sprintf('%%%s%%', $value));
}
} }

2
app/Support/Request/GetFilterInstructions.php
View File

@@ -50,6 +50,8 @@ trait GetFilterInstructions
case 'boolean': case 'boolean':
$filterValue = $this->booleanInstruction($filterValue); $filterValue = $this->booleanInstruction($filterValue);
break; break;
case 'string':
break;
} }
$result[$column] = $filterValue; $result[$column] = $filterValue;
} }

93
app/Transformers/V2/AccountTransformer.php
View File

@@ -41,6 +41,7 @@ class AccountTransformer extends AbstractTransformer
{ {
private array $accountMeta; private array $accountMeta;
private array $accountTypes; private array $accountTypes;
private array $fullTypes;
private array $balanceDifferences; private array $balanceDifferences;
private array $convertedBalances; private array $convertedBalances;
private array $currencies; private array $currencies;
@@ -55,6 +56,7 @@ class AccountTransformer extends AbstractTransformer
$this->currencies = []; $this->currencies = [];
$this->accountMeta = []; $this->accountMeta = [];
$this->accountTypes = []; $this->accountTypes = [];
$this->fullTypes = [];
$this->lastActivity = []; $this->lastActivity = [];
$this->convertedBalances = []; $this->convertedBalances = [];
$this->balanceDifferences = []; $this->balanceDifferences = [];
@@ -74,7 +76,7 @@ class AccountTransformer extends AbstractTransformer
// get last activity: // get last activity:
$this->getLastActivity($objects); $this->getLastActivity($objects);
// TODO add balance difference // add balance difference
if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) { if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
$this->getBalanceDifference($objects, $this->parameters->get('start'), $this->parameters->get('end')); $this->getBalanceDifference($objects, $this->parameters->get('start'), $this->parameters->get('end'));
} }
@@ -97,21 +99,28 @@ class AccountTransformer extends AbstractTransformer
*/ */
public function transform(Account $account): array public function transform(Account $account): array
{ {
$id = $account->id; $id = $account->id;
// various meta // various meta
$accountRole = $this->accountMeta[$id]['account_role'] ?? null; $accountRole = $this->accountMeta[$id]['account_role'] ?? null;
$accountType = $this->accountTypes[$id]; $accountType = $this->accountTypes[$id];
$order = $account->order; $order = $account->order;
// liability type
$liabilityType = $accountType === 'liabilities' ? $this->fullTypes[$id] : null;
$liabilityDirection = $this->accountMeta[$id]['liability_direction'] ?? null;
$interest = $this->accountMeta[$id]['interest'] ?? null;
$interestPeriod = $this->accountMeta[$id]['interest_period'] ?? null;
$currentDebt = $this->accountMeta[$id]['current_debt'] ?? null;
// no currency? use default // no currency? use default
$currency = $this->default; $currency = $this->default;
if (array_key_exists($id, $this->accountMeta) && 0 !== (int) ($this->accountMeta[$id]['currency_id'] ?? 0)) { if (array_key_exists($id, $this->accountMeta) && 0 !== (int) ($this->accountMeta[$id]['currency_id'] ?? 0)) {
$currency = $this->currencies[(int) $this->accountMeta[$id]['currency_id']]; $currency = $this->currencies[(int) $this->accountMeta[$id]['currency_id']];
} }
// amounts and calculation. // amounts and calculation.
$balance = $this->balances[$id]['balance'] ?? null; $balance = $this->balances[$id]['balance'] ?? null;
$nativeBalance = $this->convertedBalances[$id]['native_balance'] ?? null; $nativeBalance = $this->convertedBalances[$id]['native_balance'] ?? null;
// no order for some accounts: // no order for some accounts:
if (!in_array(strtolower($accountType), ['liability', 'liabilities', 'asset'], true)) { if (!in_array(strtolower($accountType), ['liability', 'liabilities', 'asset'], true)) {
@@ -131,20 +140,20 @@ class AccountTransformer extends AbstractTransformer
} }
return [ return [
'id' => (string) $account->id, 'id' => (string) $account->id,
'created_at' => $account->created_at->toAtomString(), 'created_at' => $account->created_at->toAtomString(),
'updated_at' => $account->updated_at->toAtomString(), 'updated_at' => $account->updated_at->toAtomString(),
'active' => $account->active, 'active' => $account->active,
'order' => $order, 'order' => $order,
'name' => $account->name, 'name' => $account->name,
'iban' => '' === (string) $account->iban ? null : $account->iban, 'iban' => '' === (string) $account->iban ? null : $account->iban,
'account_number' => $this->accountMeta[$id]['account_number'] ?? null, 'account_number' => $this->accountMeta[$id]['account_number'] ?? null,
'type' => strtolower($accountType), 'type' => strtolower($accountType),
'account_role' => $accountRole, 'account_role' => $accountRole,
'currency_id' => (string) $currency->id, 'currency_id' => (string) $currency->id,
'currency_code' => $currency->code, 'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol, 'currency_symbol' => $currency->symbol,
'currency_decimal_places' => $currency->decimal_places, 'currency_decimal_places' => $currency->decimal_places,
'native_currency_id' => (string) $this->default->id, 'native_currency_id' => (string) $this->default->id,
'native_currency_code' => $this->default->code, 'native_currency_code' => $this->default->code,
@@ -165,19 +174,20 @@ class AccountTransformer extends AbstractTransformer
// more meta // more meta
'last_activity' => array_key_exists($id, $this->lastActivity) ? $this->lastActivity[$id]->toAtomString() : null, 'last_activity' => array_key_exists($id, $this->lastActivity) ? $this->lastActivity[$id]->toAtomString() : null,
// liability stuff
'liability_type' => $liabilityType,
'liability_direction' => $liabilityDirection,
'interest' => $interest,
'interest_period' => $interestPeriod,
'current_debt' => $currentDebt,
// 'notes' => $this->repository->getNoteText($account), // 'notes' => $this->repository->getNoteText($account),
// 'monthly_payment_date' => $monthlyPaymentDate, // 'monthly_payment_date' => $monthlyPaymentDate,
// 'credit_card_type' => $creditCardType, // 'credit_card_type' => $creditCardType,
// 'account_number' => $this->repository->getMetaValue($account, 'account_number'),
// 'bic' => $this->repository->getMetaValue($account, 'BIC'), // 'bic' => $this->repository->getMetaValue($account, 'BIC'),
// 'virtual_balance' => number_format((float) $account->virtual_balance, $decimalPlaces, '.', ''), // 'virtual_balance' => number_format((float) $account->virtual_balance, $decimalPlaces, '.', ''),
// 'opening_balance' => $openingBalance, // 'opening_balance' => $openingBalance,
// 'opening_balance_date' => $openingBalanceDate, // 'opening_balance_date' => $openingBalanceDate,
// 'liability_type' => $liabilityType,
// 'liability_direction' => $liabilityDirection,
// 'interest' => $interest,
// 'interest_period' => $interestPeriod,
// 'current_debt' => $this->repository->getMetaValue($account, 'current_debt'),
// 'include_net_worth' => $includeNetWorth, // 'include_net_worth' => $includeNetWorth,
// 'longitude' => $longitude, // 'longitude' => $longitude,
// 'latitude' => $latitude, // 'latitude' => $latitude,
@@ -185,7 +195,7 @@ class AccountTransformer extends AbstractTransformer
'links' => [ 'links' => [
[ [
'rel' => 'self', 'rel' => 'self',
'uri' => '/accounts/'.$account->id, 'uri' => '/accounts/' . $account->id,
], ],
], ],
]; ];
@@ -208,14 +218,14 @@ class AccountTransformer extends AbstractTransformer
private function collectAccountMetaData(Collection $accounts): void private function collectAccountMetaData(Collection $accounts): void
{ {
/** @var CurrencyRepositoryInterface $repository */ /** @var CurrencyRepositoryInterface $repository */
$repository = app(CurrencyRepositoryInterface::class); $repository = app(CurrencyRepositoryInterface::class);
/** @var AccountRepositoryInterface $accountRepository */ /** @var AccountRepositoryInterface $accountRepository */
$accountRepository = app(AccountRepositoryInterface::class); $accountRepository = app(AccountRepositoryInterface::class);
$metaFields = $accountRepository->getMetaValues($accounts, ['currency_id', 'account_role', 'account_number']); $metaFields = $accountRepository->getMetaValues($accounts, ['currency_id', 'account_role', 'account_number', 'liability_direction', 'interest', 'interest_period', 'current_debt']);
$currencyIds = $metaFields->where('name', 'currency_id')->pluck('data')->toArray(); $currencyIds = $metaFields->where('name', 'currency_id')->pluck('data')->toArray();
$currencies = $repository->getByIds($currencyIds); $currencies = $repository->getByIds($currencyIds);
foreach ($currencies as $currency) { foreach ($currencies as $currency) {
$id = $currency->id; $id = $currency->id;
$this->currencies[$id] = $currency; $this->currencies[$id] = $currency;
@@ -235,6 +245,7 @@ class AccountTransformer extends AbstractTransformer
/** @var AccountType $row */ /** @var AccountType $row */
foreach ($accountTypes as $row) { foreach ($accountTypes as $row) {
$this->accountTypes[$row->id] = (string) config(sprintf('firefly.shortNamesByFullName.%s', $row->type)); $this->accountTypes[$row->id] = (string) config(sprintf('firefly.shortNamesByFullName.%s', $row->type));
$this->fullTypes[$row->id] = $row->type;
} }
} }
@@ -275,6 +286,9 @@ class AccountTransformer extends AbstractTransformer
if ('balance_difference' === $column) { if ('balance_difference' === $column) {
$accounts = $this->sortByBalanceDifference($accounts, $direction); $accounts = $this->sortByBalanceDifference($accounts, $direction);
} }
if ('current_debt' === $column) {
$accounts = $this->sortByCurrentDebt($accounts, $direction);
}
} }
return $accounts; return $accounts;
@@ -365,4 +379,19 @@ class AccountTransformer extends AbstractTransformer
return $rightBalance <=> $leftBalance; return $rightBalance <=> $leftBalance;
}); });
} }
private function sortByCurrentDebt(Collection $accounts, string $direction): Collection
{
$amounts = $this->accountMeta;
return $accounts->sort(function (Account $left, Account $right) use ($amounts, $direction) {
$leftCurrent = (float) ($amounts[$left->id]['current_debt'] ?? 0);
$rightCurrent = (float) ($amounts[$right->id]['current_debt'] ?? 0);
if ('asc' === $direction) {
return $leftCurrent <=> $rightCurrent;
}
return $rightCurrent <=> $leftCurrent;
});
}
} }

4
config/firefly.php
View File

@@ -924,7 +924,7 @@ return [
'filters' => [ 'filters' => [
'allowed' => [ 'allowed' => [
'accounts' => [ 'accounts' => [
'name' => '*', 'name' => 'string',
'active' => 'boolean', 'active' => 'boolean',
'iban' => 'iban', 'iban' => 'iban',
'balance' => 'numeric', 'balance' => 'numeric',
@@ -938,7 +938,7 @@ return [
'sorting' => [ 'sorting' => [
'allowed' => [ 'allowed' => [
'transactions' => ['description', 'amount'], 'transactions' => ['description', 'amount'],
'accounts' => ['name', 'active', 'iban', 'balance', 'last_activity', 'balance_difference'], 'accounts' => ['name', 'active', 'iban', 'balance', 'last_activity', 'balance_difference','current_debt'],
], ],
], ],
]; ];

9
config/translations.php
View File

@@ -52,6 +52,15 @@ return [
'bad_type_destination', 'bad_type_destination',
], ],
'firefly' => [ 'firefly' => [
'liability_direction_debit_short',
'liability_direction_credit_short',
'interest_calc_yearly',
'interest_calc_',
'interest_calc_daily',
'interest_calc_monthly',
'interest_calc_weekly',
'interest_calc_half-year',
'interest_calc_quarterly',
'spent', 'spent',
'administration_owner', 'administration_owner',
'administration_you', 'administration_you',

1
resources/assets/v2/src/boot/bootstrap.js vendored
View File

@@ -43,6 +43,7 @@ store.addPlugin(observePlugin);
window.bootstrapped = false; window.bootstrapped = false;
window.store = store; window.store = store;
window.bootstrap = bootstrap;

59
resources/assets/v2/src/pages/accounts/index.js
View File

@@ -32,7 +32,6 @@ import {showWizardButton} from "../../support/page-settings/show-wizard-button.j
import {setVariable} from "../../store/set-variable.js"; import {setVariable} from "../../store/set-variable.js";
import {getVariables} from "../../store/get-variables.js"; import {getVariables} from "../../store/get-variables.js";
import pageNavigation from "../../support/page-navigation.js"; import pageNavigation from "../../support/page-navigation.js";
import {getCacheKey} from "../../support/get-cache-key.js";
// set type from URL // set type from URL
@@ -144,10 +143,36 @@ let index = function () {
}, },
editors: {}, editors: {},
accounts: [], accounts: [],
lastClickedFilter: '',
lastFilterInput: '',
goToPage(page) { goToPage(page) {
this.page = page; this.page = page;
this.loadAccounts(); this.loadAccounts();
}, },
applyFilter() {
this.filters[this.lastClickedFilter] = this.lastFilterInput;
this.page = 1;
setVariable(this.getPreferenceKey('filters'), this.filters);
// hide modal
window.bootstrap.Modal.getInstance(document.getElementById('filterModal')).hide();
this.loadAccounts();
},
removeFilter(field) {
this.filters[field] = null;
this.page = 1;
setVariable(this.getPreferenceKey('filters'), this.filters);
this.loadAccounts();
},
hasFilters() {
return this.filters.name !== null;
},
showFilterDialog(field) {
this.lastFilterInput = this.filters[field] ?? '';
this.lastClickedFilter = field;
document.getElementById('filterInput').focus();
},
accountRole(roleName) { accountRole(roleName) {
return i18next.t('firefly.account_role_' + roleName); return i18next.t('firefly.account_role_' + roleName);
}, },
@@ -159,7 +184,7 @@ let index = function () {
}, },
sort(column) { sort(column) {
this.page =1; this.page = 1;
this.pageOptions.sortingColumn = column; this.pageOptions.sortingColumn = column;
this.pageOptions.sortDirection = this.pageOptions.sortDirection === 'asc' ? 'desc' : 'asc'; this.pageOptions.sortDirection = this.pageOptions.sortDirection === 'asc' ? 'desc' : 'asc';
@@ -179,7 +204,7 @@ let index = function () {
}, },
generatePageUrl(includePageNr) { generatePageUrl(includePageNr) {
let url = './accounts/' + type + '?column=' + this.pageOptions.sortingColumn + '&direction=' + this.pageOptions.sortDirection + '&page='; let url = './accounts/' + type + '?column=' + this.pageOptions.sortingColumn + '&direction=' + this.pageOptions.sortDirection + '&page=';
if(includePageNr) { if (includePageNr) {
return url + this.page return url + this.page
} }
return url; return url;
@@ -204,6 +229,15 @@ let index = function () {
}, },
init() { init() {
// modal filter thing
const myModalEl = document.getElementById('filterModal')
myModalEl.addEventListener('shown.bs.modal', event => {
document.getElementById('filterInput').focus();
})
// some opts
this.pageOptions.isLoading = true; this.pageOptions.isLoading = true;
this.notifications.wait.show = true; this.notifications.wait.show = true;
this.page = page; this.page = page;
@@ -230,7 +264,7 @@ let index = function () {
this.pageOptions.sortDirection = '' === this.pageOptions.sortDirection ? res[2] : this.pageOptions.sortDirection; this.pageOptions.sortDirection = '' === this.pageOptions.sortDirection ? res[2] : this.pageOptions.sortDirection;
// filters // filters
for(let k in res[3]) { for (let k in res[3]) {
if (res[3].hasOwnProperty(k) && this.filters.hasOwnProperty(k)) { if (res[3].hasOwnProperty(k) && this.filters.hasOwnProperty(k)) {
this.filters[k] = res[3][k]; this.filters[k] = res[3][k];
} }
@@ -241,13 +275,13 @@ let index = function () {
}, },
saveActiveFilter(e) { saveActiveFilter(e) {
this.page = 1; this.page = 1;
if('both' === e.currentTarget.value) { if ('both' === e.currentTarget.value) {
this.filters.active = null; this.filters.active = null;
} }
if('active' === e.currentTarget.value) { if ('active' === e.currentTarget.value) {
this.filters.active = true; this.filters.active = true;
} }
if('inactive' === e.currentTarget.value) { if ('inactive' === e.currentTarget.value) {
this.filters.active = false; this.filters.active = false;
} }
setVariable(this.getPreferenceKey('filters'), this.filters); setVariable(this.getPreferenceKey('filters'), this.filters);
@@ -301,8 +335,8 @@ let index = function () {
// filter instructions // filter instructions
let filters = []; let filters = [];
for(let k in this.filters) { for (let k in this.filters) {
if(this.filters.hasOwnProperty(k) && null !== this.filters[k]) { if (this.filters.hasOwnProperty(k) && null !== this.filters[k]) {
filters.push({column: k, filter: this.filters[k]}); filters.push({column: k, filter: this.filters[k]});
} }
} }
@@ -351,7 +385,12 @@ let index = function () {
native_currency_code: current.attributes.native_currency_code, native_currency_code: current.attributes.native_currency_code,
last_activity: null === current.attributes.last_activity ? '' : format(new Date(current.attributes.last_activity), i18next.t('config.month_and_day_fns')), last_activity: null === current.attributes.last_activity ? '' : format(new Date(current.attributes.last_activity), i18next.t('config.month_and_day_fns')),
balance_difference: current.attributes.balance_difference, balance_difference: current.attributes.balance_difference,
native_balance_difference: current.attributes.native_balance_difference native_balance_difference: current.attributes.native_balance_difference,
liability_type: current.attributes.liability_type,
liability_direction: current.attributes.liability_direction,
interest: current.attributes.interest,
interest_period: current.attributes.interest_period,
current_debt: current.attributes.current_debt,
}; };
this.accounts.push(account); this.accounts.push(account);
} }

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

@@ -2327,6 +2327,15 @@ return [
'no_tags' => '(no tags)', 'no_tags' => '(no tags)',
'nothing_found' => '(nothing found)', 'nothing_found' => '(nothing found)',
// page settings and wizard dialogs
'page_settings_header' => 'Page settings',
'visible_columns' => 'Visible columns',
'accounts_to_show' => 'Accounts to show',
'active_accounts_only' => 'Active accounts only',
'in_active_accounts_only' => 'Inactive accounts only',
'show_all_accounts' => 'Show all accounts',
// piggy banks: // piggy banks:
'event_history' => 'Event history', 'event_history' => 'Event history',
'add_money_to_piggy' => 'Add money to piggy bank ":name"', 'add_money_to_piggy' => 'Add money to piggy bank ":name"',

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

@@ -28,6 +28,7 @@ return [
// new user: // new user:
'bank_name' => 'Bank name', 'bank_name' => 'Bank name',
'bank_balance' => 'Balance', 'bank_balance' => 'Balance',
'current_balance' => 'Current balance',
'savings_balance' => 'Savings balance', 'savings_balance' => 'Savings balance',
'credit_card_limit' => 'Credit card limit', 'credit_card_limit' => 'Credit card limit',
'automatch' => 'Match automatically', 'automatch' => 'Match automatically',

126
resources/views/v2/accounts/index.blade.php
View File

@@ -7,30 +7,30 @@
<div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12"> <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Net worth</h3> <h3 class="card-title">{{ __('firefly.net_worth') }}</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
some chart TODO
</div> </div>
</div> </div>
</div> </div>
<div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12"> <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">In + out this period</h3> <h3 class="card-title">{{ __('firefly.in_out_period') }}</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
Same TODO
</div> </div>
</div> </div>
</div> </div>
<div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12"> <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Something else</h3> <h3 class="card-title">TODO</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
Same TODO
</div> </div>
</div> </div>
</div> </div>
@@ -46,7 +46,7 @@
<div class="card-header"> <div class="card-header">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<h3 class="card-title">Accounts (ungrouped)</h3> <h3 class="card-title">{{ __('firefly.undefined_accounts') }}</h3>
</div> </div>
<div class="col text-end"> <div class="col text-end">
</div> </div>
@@ -55,13 +55,14 @@
<div class="card-body p-0"> <div class="card-body p-0">
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr x-show="hasFilters()">
<td x-show="tableColumns.drag_and_drop.visible && tableColumns.drag_and_drop.enabled"> <td x-show="tableColumns.drag_and_drop.visible && tableColumns.drag_and_drop.enabled">
&nbsp; &nbsp;
</td> </td>
<td x-show="tableColumns.active.visible && tableColumns.active.enabled">&nbsp;</td> <td x-show="tableColumns.active.visible && tableColumns.active.enabled">&nbsp;</td>
<td x-show="tableColumns.name.visible && tableColumns.name.enabled"> <td x-show="tableColumns.name.visible && tableColumns.name.enabled">
<em>"Filtered"</em> <em x-show="'' !== filters.name && null !== filters.name">"<span x-text="filters.name"></span>"</em>
<a href="#" @click.prevent="removeFilter('name')"><em class="text-danger fa fa-trash-can"></em></a>
</td> </td>
<td x-show="tableColumns.type.visible && tableColumns.type.enabled">&nbsp;</td> <td x-show="tableColumns.type.visible && tableColumns.type.enabled">&nbsp;</td>
<td x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled"> <td x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled">
@@ -95,60 +96,69 @@
&nbsp; &nbsp;
</th> </th>
<th x-show="tableColumns.active.visible && tableColumns.active.enabled"> <th x-show="tableColumns.active.visible && tableColumns.active.enabled">
<a href="#" x-on:click.prevent="sort('active')">Active?</a> <a href="#" x-on:click.prevent="sort('active')">{{ __('list.active') }}</a>
<em x-show="pageOptions.sortingColumn === 'active' && pageOptions.sortDirection === 'asc'" <em x-show="pageOptions.sortingColumn === 'active' && pageOptions.sortDirection === 'asc'"
class="fa-solid fa-arrow-down-short-wide"></em> class="fa-solid fa-arrow-down-short-wide"></em>
<em x-show="pageOptions.sortingColumn === 'active' && pageOptions.sortDirection === 'desc'" <em x-show="pageOptions.sortingColumn === 'active' && pageOptions.sortDirection === 'desc'"
class="fa-solid fa-arrow-down-wide-short"></em> class="fa-solid fa-arrow-down-wide-short"></em>
</th> </th>
<th x-show="tableColumns.name.visible && tableColumns.name.enabled"> <th x-show="tableColumns.name.visible && tableColumns.name.enabled">
<a href="#" x-on:click.prevent="sort('name')">Name</a> <a href="#" x-on:click.prevent="sort('name')">{{ __('list.name') }}</a>
<em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'asc'" <em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'asc'"
class="fa-solid fa-arrow-down-a-z"></em> class="fa-solid fa-arrow-down-a-z"></em>
<em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'desc'" <em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'desc'" class="fa-solid fa-arrow-down-z-a"></em>
class="fa-solid fa-arrow-down-z-a"></em> <a @click.prevent="showFilterDialog('name')" href="#" data-bs-toggle="modal" data-bs-target="#filterModal"><em class="fa-solid fa-magnifying-glass"></em></a>
</th> </th>
<th x-show="tableColumns.type.visible && tableColumns.type.enabled">Type</th> <th x-show="tableColumns.type.visible && tableColumns.type.enabled">{{ __('list.type') }}</th>
<th x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled"> <th x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled">
Liability type {{ __('list.liability_type') }}
</th> </th>
<th x-show="tableColumns.liability_direction.visible && tableColumns.liability_direction.enabled"> <th x-show="tableColumns.liability_direction.visible && tableColumns.liability_direction.enabled">
Liability direction {{ __('list.liability_direction') }}
</th> </th>
<th x-show="tableColumns.liability_interest.visible && tableColumns.liability_interest.enabled"> <th x-show="tableColumns.liability_interest.visible && tableColumns.liability_interest.enabled">
Liability interest {{ __('list.interest') }}
</th> </th>
<th x-show="tableColumns.number.visible && tableColumns.number.enabled"> <th x-show="tableColumns.number.visible && tableColumns.number.enabled">
<a href="#" x-on:click.prevent="sort('iban')">Account number</a> <a href="#" x-on:click.prevent="sort('iban')">
{{ __('list.account_number') }}
</a>
<em x-show="pageOptions.sortingColumn === 'iban' && pageOptions.sortDirection === 'asc'" <em x-show="pageOptions.sortingColumn === 'iban' && pageOptions.sortDirection === 'asc'"
class="fa-solid fa-arrow-down-a-z"></em> class="fa-solid fa-arrow-down-a-z"></em>
<em x-show="pageOptions.sortingColumn === 'iban' && pageOptions.sortDirection === 'desc'" <em x-show="pageOptions.sortingColumn === 'iban' && pageOptions.sortDirection === 'desc'"
class="fa-solid fa-arrow-down-z-a"></em> class="fa-solid fa-arrow-down-z-a"></em>
</th> </th>
<th x-show="tableColumns.current_balance.visible && tableColumns.current_balance.enabled"> <th x-show="tableColumns.current_balance.visible && tableColumns.current_balance.enabled">
<a href="#" x-on:click.prevent="sort('balance')">Current balance</a> <a href="#" x-on:click.prevent="sort('balance')">
{{ __('list.current_balance') }}
</a>
<em x-show="pageOptions.sortingColumn === 'balance' && pageOptions.sortDirection === 'asc'" <em x-show="pageOptions.sortingColumn === 'balance' && pageOptions.sortDirection === 'asc'"
class="fa-solid fa-arrow-down-9-1"></em> class="fa-solid fa-arrow-down-9-1"></em>
<em x-show="pageOptions.sortingColumn === 'balance' && pageOptions.sortDirection === 'desc'" <em x-show="pageOptions.sortingColumn === 'balance' && pageOptions.sortDirection === 'desc'"
class="fa-solid fa-arrow-down-1-9"></em> class="fa-solid fa-arrow-down-1-9"></em>
</th> </th>
<th x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled"> <th x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled">
<a href="#" x-on:click.prevent="sort('amount_due')">Amount due</a> <a href="#" x-on:click.prevent="sort('current_debt')">
<em x-show="pageOptions.sortingColumn === 'amount_due' && pageOptions.sortDirection === 'asc'" {{ __('list.amount_due') }}
</a>
<em x-show="pageOptions.sortingColumn === 'current_debt' && pageOptions.sortDirection === 'asc'"
class="fa-solid fa-arrow-down-wide-short"></em> class="fa-solid fa-arrow-down-wide-short"></em>
<em x-show="pageOptions.sortingColumn === 'amount_due' && pageOptions.sortDirection === 'desc'" <em x-show="pageOptions.sortingColumn === 'current_debt' && pageOptions.sortDirection === 'desc'"
class="fa-solid fa-arrow-up-wide-short"></em> class="fa-solid fa-arrow-up-wide-short"></em>
</th> </th>
<th x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled"> <th x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled">
<a href="#" x-on:click.prevent="sort('last_activity')">Last activity</a> <a href="#" x-on:click.prevent="sort('last_activity')">
{{ __('list.last_activity') }}
</a>
<em x-show="pageOptions.sortingColumn === 'last_activity' && pageOptions.sortDirection === 'asc'" <em x-show="pageOptions.sortingColumn === 'last_activity' && pageOptions.sortDirection === 'asc'"
class="fa-solid fa-arrow-down-wide-short"></em> class="fa-solid fa-arrow-down-wide-short"></em>
<em x-show="pageOptions.sortingColumn === 'last_activity' && pageOptions.sortDirection === 'desc'" <em x-show="pageOptions.sortingColumn === 'last_activity' && pageOptions.sortDirection === 'desc'"
class="fa-solid fa-arrow-up-wide-short"></em> class="fa-solid fa-arrow-up-wide-short"></em>
</th> </th>
<th x-show="tableColumns.balance_difference.visible && tableColumns.balance_difference.enabled"> <th x-show="tableColumns.balance_difference.visible && tableColumns.balance_difference.enabled">
<a href="#" x-on:click.prevent="sort('balance_difference')">Balance <a href="#" x-on:click.prevent="sort('balance_difference')">
difference</a> {{ __('list.balance_difference') }}</a>
<em x-show="pageOptions.sortingColumn === 'balance_difference' && pageOptions.sortDirection === 'asc'" <em x-show="pageOptions.sortingColumn === 'balance_difference' && pageOptions.sortDirection === 'asc'"
class="fa-solid fa-arrow-down-wide-short"></em> class="fa-solid fa-arrow-down-wide-short"></em>
<em x-show="pageOptions.sortingColumn === 'balance_difference' && pageOptions.sortDirection === 'desc'" <em x-show="pageOptions.sortingColumn === 'balance_difference' && pageOptions.sortDirection === 'desc'"
@@ -220,9 +230,16 @@
<span x-text="accountRole(account.role)"></span>" <span x-text="accountRole(account.role)"></span>"
</template> </template>
</td> </td>
<td x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled"></td> <td x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled">
<td x-show="tableColumns.liability_direction.visible && tableColumns.liability_direction.enabled"></td> <span x-text="$t('firefly.account_type_' + account.liability_type)"></span>
<td x-show="tableColumns.liability_interest.visible && tableColumns.liability_interest.enabled"></td> </td>
<td x-show="tableColumns.liability_direction.visible && tableColumns.liability_direction.enabled">
<span x-text="$t('firefly.liability_direction_' + account.liability_direction + '_short')"></span>
</td>
<td x-show="tableColumns.liability_interest.visible && tableColumns.liability_interest.enabled">
<span x-text="account.interest"></span>%
(<span x-text="$t('firefly.interest_calc_' + account.interest_period)"></span>)
</td>
<td x-show="tableColumns.number.visible && tableColumns.number.enabled"> <td x-show="tableColumns.number.visible && tableColumns.number.enabled">
<!-- IBAN and no account nr --> <!-- IBAN and no account nr -->
<template x-if="'' === account.account_number && '' !== account.iban"> <template x-if="'' === account.account_number && '' !== account.iban">
@@ -245,7 +262,10 @@
x-text="formatMoney(account.native_current_balance, account.currency_code)"></span> x-text="formatMoney(account.native_current_balance, account.currency_code)"></span>
</td> </td>
<td x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled"> <td x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled">
TODO <template x-if="null !== account.current_debt">
<span
x-text="formatMoney(account.current_debt, account.currency_code)"></span>
</template>
</td> </td>
<td x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled"> <td x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled">
<span x-text="account.last_activity"></span> <span x-text="account.last_activity"></span>
@@ -304,12 +324,12 @@
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title fs-5" id="internalsModalLabel">TODO Page settings</h1> <h1 class="modal-title fs-5" id="internalsModalLabel">{{ __('firefly.page_settings_header') }}</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="row mb-3"> <div class="row mb-3">
<label for="inputEmail3" class="col-sm-4 col-form-label">Visible columns</label> <label class="col-sm-4 col-form-label">{{ __('firefly.visible_columns') }}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<template x-for="(column, key) in tableColumns" :key="key"> <template x-for="(column, key) in tableColumns" :key="key">
<div class="form-check form-switch form-check-inline" x-show="column.visible"> <div class="form-check form-switch form-check-inline" x-show="column.visible">
@@ -323,19 +343,19 @@
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<label for="inputEmail3" class="col-sm-4 col-form-label">Active accounts?</label> <label class="col-sm-4 col-form-label">{{ __('firefly.accounts_to_show') }}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select @change="saveActiveFilter" class="form-control"> <select @change="saveActiveFilter" class="form-control">
<option value="active" :selected="true === filters.active" label="Active accounts">Active accounts only</option> <option value="active" :selected="true === filters.active" label="{{ __('firefly.active_accounts_only') }}">{{ __('firefly.active_accounts_only') }}</option>
<option value="inactive" :selected="false === filters.active" label="Inactive accounts">Inactive accounts only <option value="inactive" :selected="false === filters.active" label="{{ __('firefly.inactive_accounts_only') }}">{{ __('firefly.inactive_accounts_only') }}
</option> </option>
<option value="both" :selected="null === filters.active" label="Both">All accounts</option> <option value="both" :selected="null === filters.active" label="{{ __('firefly.show_all_accounts') }}">{{ __('firefly.show_all_accounts') }}</option>
</select> </select>
<div id="emailHelp" class="form-text">TODO Bla bla bla.</div>
</div> </div>
</div> </div>
<!--
<div class="row mb-3"> <div class="row mb-3">
<label for="inputEmail3" class="col-sm-4 col-form-label">Group accounts</label> <label class="col-sm-4 col-form-label">Group accounts</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="form-check form-switch"> <div class="form-check form-switch">
<label> <label>
@@ -345,6 +365,8 @@
</div> </div>
</div> </div>
</div> </div>
-->
<!--
<div class="row mb-3"> <div class="row mb-3">
<label for="inputEmail3" class="col-sm-4 col-form-label">Show info boxes</label> <label for="inputEmail3" class="col-sm-4 col-form-label">Show info boxes</label>
<div class="col-sm-8"> <div class="col-sm-8">
@@ -365,9 +387,10 @@
</div> </div>
</div> </div>
</div> </div>
-->
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ __('firefly.close') }}</button>
</div> </div>
</div> </div>
</div> </div>
@@ -375,6 +398,32 @@
</div> </div>
</div> </div>
<div class="modal fade" id="filterModal" tabindex="-1" aria-labelledby="filterModalLabel" aria-hidden="true">
<div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="filterModalLabel">TODO Filter field</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="mb-3">
<label for="filterInput" class="form-label">Search in column: <span x-text="lastClickedFilter"></span></label>
<input @keyup.enter="applyFilter()" type="text" class="form-control" id="filterInput" placeholder="" x-model="lastFilterInput">
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><em
class="fa-solid fa-right-from-bracket"></em> Cancel
</button>
<button @click="applyFilter()" type="button" class="btn btn-primary" data-bs-dismiss="modal"><em
class="fa-solid fa-magnifying-glass"></em> Search
</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="wizardModal" tabindex="-1" aria-labelledby="wizardModalLabel" aria-hidden="true"> <div class="modal fade" id="wizardModal" tabindex="-1" aria-labelledby="wizardModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
@@ -383,6 +432,7 @@
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
Quick intro about this page<br><br>
Need to learn what's on this page?<br> Need to learn what's on this page?<br>
Take me to the help pages (opens in a new window or tab) Take me to the help pages (opens in a new window or tab)
</div> </div>