Skip to content

Firefly III: a personal finances manager

Improve list for pagination.

James Cole079293504d45
diff --git a/config/translations.php b/config/translations.php
index 35cd1937b0..5e2d293330 100644
--- a/config/translations.php
+++ b/config/translations.php
@@ -67,6 +67,10 @@ return [
'wait_loading_page',
'save_transaction_working',
'save_links_working',
+ 'never',
+ 'account_type_loan',
+ 'account_type_mortgage',
+ 'account_type_debt',
'withdrawal',
'i_owe_amount',
'intro_next_label',
diff --git a/resources/assets/v3/js/pages/accounts/index.js b/resources/assets/v3/js/pages/accounts/index.js
index c9aef4b499..c7b252278a 100644
--- a/resources/assets/v3/js/pages/accounts/index.js
+++ b/resources/assets/v3/js/pages/accounts/index.js
@@ -112,9 +112,23 @@ let index = function () {
let current = response.data.data[i];
let balanceDifference = formatMoney(current.attributes.balance_difference, current.attributes.currency_code, true);
let balanceDiffFloat = parseFloat(current.attributes.balance_difference);
+ let currentBalance = formatMoney(current.attributes.current_balance, current.attributes.currency_code);
+ let currentBalanceFloat = parseFloat(current.attributes.current_balance);
+ let currentDebt = formatMoney(current.attributes.debt_amount, current.attributes.currency_code);
+ let currentDebtFloat = parseFloat(current.attributes.debt_amount);
if (window.store.get('convert_to_primary')) {
balanceDifference = formatMoney(current.attributes.pc_balance_difference, current.attributes.primary_currency_code, true);
balanceDiffFloat = parseFloat(current.attributes.pc_balance_difference);
+ currentBalance = formatMoney(current.attributes.pc_current_balance, current.attributes.primary_currency_code);
+ currentBalanceFloat = parseFloat(current.attributes.pc_current_balance);
+ currentDebt = formatMoney(current.attributes.pc_debt_amount, current.attributes.primary_currency_code);
+ currentDebtFloat = parseFloat(current.attributes.pc_debt_amount);
+ }
+ let lastActivity = this.formatDate(current.attributes.last_activity);
+ let noLastActivity = false;
+ if('' === lastActivity) {
+ lastActivity = i18next.t('firefly.never');
+ noLastActivity = true;
}
console.log(current);
let account = {
@@ -125,10 +139,19 @@ let index = function () {
role: current.attributes.account_role,
iban: this.addSpaces(current.attributes.iban),
account_number: current.attributes.account_number,
+ current_balance: currentBalance,
+ current_balance_float: currentBalanceFloat,
active: current.attributes.active,
- last_activity: this.formatDate(current.attributes.last_activity),
+ last_activity: lastActivity,
+ no_last_activity: noLastActivity,
balance_difference: balanceDifference,
balance_difference_float: balanceDiffFloat,
+ liability_type: i18next.t('firefly.account_type_' + current.attributes.liability_type),
+ liability_direction: i18next.t('firefly.liability_direction_' + current.attributes.liability_direction + '_short'),
+ liability_interest: current.attributes.interest,
+ liability_interest_period: i18next.t('firefly.interest_calc_' + current.attributes.interest_period).toLowerCase(),
+ current_debt: currentDebt,
+ current_debt_float: currentDebtFloat,
};
this.accounts.push(account);
}
diff --git a/resources/views/accounts/index.blade.php b/resources/views/accounts/index.blade.php
index a699841c28..8a0933ab79 100644
--- a/resources/views/accounts/index.blade.php
+++ b/resources/views/accounts/index.blade.php
@@ -30,7 +30,7 @@
<th>{{ trans('list.interest') }} ({{ trans('list.interest_period') }})</th>
</template>
<th>{{ trans('form.account_number') }}</th>
- <template x-if="'liabilities' === objectType">
+ <template x-if="'liabilities' !== objectType">
<th class="text-end">{{ trans('list.currentBalance') }}</th>
</template>
<template x-if="'liabilities' === objectType">
@@ -76,17 +76,18 @@
</template>
<template x-if="'liabilities' === objectType">
<td>
- TODO liabilitie type
+ <span x-text="account.liability_type"></span>
</td>
</template>
<template x-if="'liabilities' === objectType">
<td>
- TODO liabilitie dir
+ <span x-text="account.liability_direction"></span>
</td>
</template>
<template x-if="'liabilities' === objectType">
<td>
- TODO interest
+ <span x-text="account.liability_interest"></span>%
+ (<span x-text="account.liability_interest_period"></span>)
</td>
</template>
<td>
@@ -95,14 +96,30 @@
<span x-text="account.account_number"></span>
</template>
</td>
- <template x-if="'liabilities' === objectType">
- <td>
- TODO current blaance
+ <template x-if="'liabilities' !== objectType">
+ <td class="text-end">
+ <template x-if="0.0 === account.current_balance_float">
+ <span class="money-neutral" x-text="account.current_balance"></span>
+ </template>
+ <template x-if="account.current_balance_float > 0.0">
+ <span class="money-positive" x-text="account.current_balance"></span>
+ </template>
+ <template x-if="account.current_balance_float < 0.0">
+ <span class="money-negative" x-text="account.current_balance"></span>
+ </template>
</td>
</template>
<template x-if="'liabilities' === objectType">
- <td>
- TODO left in debt
+ <td class="text-end">
+ <template x-if="0.0 === account.current_debt_float">
+ <span class="money-neutral" x-text="account.current_debt"></span>
+ </template>
+ <template x-if="account.current_debt_float > 0.0">
+ <span class="money-positive" x-text="account.current_debt"></span>
+ </template>
+ <template x-if="account.current_debt_float < 0.0">
+ <span class="money-negative" x-text="account.current_debt"></span>
+ </template>
</td>
</template>
<td class="d-md-table-cell d-none">
@@ -115,10 +132,15 @@
</td>
<template x-if="'liabilities' !== objectType">
<td>
- <span x-text="account.last_activity"></span>
+ <template x-if="true === account.no_last_activity">
+ <em class="text-muted" x-text="account.last_activity"></em>
+ </template>
+ <template x-if="false === account.no_last_activity">
+ <span x-text="account.last_activity"></span>
+ </template>
</td>
</template>
- <td>
+ <td class="text-end">
<template x-if="0.0 === account.balance_difference_float">
<span class="money-neutral" x-text="account.balance_difference"></span>
</template>