esoko/rvr-nextgen
esoko/rvr-nextgen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

feature/layout-improvements #38

Merged
bence merged 2 commits from feature/layout-improvements into master 2023-05-01 23:42:31 +02:00
Conversation 0 Commits 2 Files Changed 10 +12 -12
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b5dc96f98b - Show all commits

12
src/Controller/CommunityController.php
View File

@ -53,18 +53,18 @@ class CommunityController implements IAuthenticationRequired
$balanceCalculator = new BalanceCalculator($community); $balanceCalculator = new BalanceCalculator($community);
$debts = $balanceCalculator->calculate(); $debts = $balanceCalculator->calculate();
$debtUsers = []; $debtItems = [];
$debtBalance = 0.0; $debtBalance = 0.0;
$outstandingUsers = []; $outstandingItems = [];
$outstandingBalance = 0.0; $outstandingBalance = 0.0;
foreach ($debts as $debt) { foreach ($debts as $debt) {
if ($debt['payer']->getId() === \Container::$request->user()->getUniqueId()) { if ($debt['payer']->getId() === \Container::$request->user()->getUniqueId()) {
$debtBalance += $debt['amount']; $debtBalance += $debt['amount'];
$debtUsers[] = $debt; $debtItems[] = $debt;
} }
if ($debt['payee']->getId() === \Container::$request->user()->getUniqueId()) { if ($debt['payee']->getId() === \Container::$request->user()->getUniqueId()) {
$outstandingBalance += $debt['amount']; $outstandingBalance += $debt['amount'];
$outstandingUsers[] = $debt; $outstandingItems[] = $debt;
} }
} }
$balance = $outstandingBalance - $debtBalance; $balance = $outstandingBalance - $debtBalance;
@ -74,9 +74,9 @@ class CommunityController implements IAuthenticationRequired
'members' => $this->getMembers($community), 'members' => $this->getMembers($community),
'currencies' => $this->getCurrencies($community), 'currencies' => $this->getCurrencies($community),
'upcomingEvents' => [], 'upcomingEvents' => [],
'debtUsers' => $debtUsers, 'debtItems' => $debtItems,
'debtBalance' => $debtBalance, 'debtBalance' => $debtBalance,
'outstandingUsers' => $outstandingUsers, 'outstandingItems' => $outstandingItems,
'outstandingBalance' => $outstandingBalance, 'outstandingBalance' => $outstandingBalance,
'balance' => $balance, 'balance' => $balance,
'editPermission' => $ownCommunityMember->getOwner() 'editPermission' => $ownCommunityMember->getOwner()

12
views/communities/community.php
View File

@ -52,20 +52,20 @@
<td class="bold">You owe</td> <td class="bold">You owe</td>
<td class="mono red" style="text-align: right;"><?= number_format($debtBalance, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td> <td class="mono red" style="text-align: right;"><?= number_format($debtBalance, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
</tr> </tr>
<?php foreach ($debtUsers as $owe): ?> <?php foreach ($debtItems as $item): ?>
<tr> <tr>
<td class="small"><?= $owe['payee']->getUser()->getDisplayName() ?></td> <td class="small"><?= $item['payee']->getUser()->getDisplayName() ?></td>
<td class="small mono red" style="text-align: right;"><?= number_format($owe['amount'], $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td> <td class="small mono red" style="text-align: right;"><?= number_format($item['amount'], $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<tr> <tr>
<td class="bold">You're owed</td> <td class="bold">You're owed</td>
<td class="mono green" style="text-align: right;"><?= number_format($outstandingBalance, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td> <td class="mono green" style="text-align: right;"><?= number_format($outstandingBalance, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
</tr> </tr>
<?php foreach ($outstandingUsers as $owe): ?> <?php foreach ($outstandingItems as $item): ?>
<tr> <tr>
<td class="small"><?= $owe['payer']->getUser()->getDisplayName() ?></td> <td class="small"><?= $item['payer']->getUser()->getDisplayName() ?></td>
<td class="small mono green" style="text-align: right;"><?= number_format($owe['amount'], $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td> <td class="small mono green" style="text-align: right;"><?= number_format($item['amount'], $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<tr> <tr>