Merge pull request 'feature/layout-improvements' (!38 ) from feature/layout-improvements into master

Reviewed-on: #38
make community layout clearer
2023-05-01 23:42:30 +02:00 · 2023-05-01 23:37:30 +02:00 · 2023-05-01 23:02:57 +02:00
10 changed files with 135 additions and 91 deletions
--- a/src/Controller/CommunityController.php
+++ b/src/Controller/CommunityController.php
@ -53,36 +53,48 @@ class CommunityController implements IAuthenticationRequired

        $balanceCalculator = new BalanceCalculator($community);
        $debts = $balanceCalculator->calculate();
-        $debtUsers = [];
+        $debtItems = [];
        $debtBalance = 0.0;
-        $outstandingUsers = [];
+        $outstandingItems = [];
        $outstandingBalance = 0.0;
        foreach ($debts as $debt) {
            if ($debt['payer']->getId() === \Container::$request->user()->getUniqueId()) {
                $debtBalance += $debt['amount'];
-                $debtUsers[] = $debt;
+                $debtItems[] = $debt;
            }
            if ($debt['payee']->getId() === \Container::$request->user()->getUniqueId()) {
                $outstandingBalance += $debt['amount'];
-                $outstandingUsers[] = $debt;
+                $outstandingItems[] = $debt;
            }
        }
        $balance = $outstandingBalance - $debtBalance;

        return new HtmlContent('communities/community', [
            'community' => $community,
-            'members' => $this->getMembers($community),
-            'currencies' => $this->getCurrencies($community),
            'upcomingEvents' => [],
-            'debtUsers' => $debtUsers,
+            'debtItems' => $debtItems,
            'debtBalance' => $debtBalance,
-            'outstandingUsers' => $outstandingUsers,
+            'outstandingItems' => $outstandingItems,
            'outstandingBalance' => $outstandingBalance,
            'balance' => $balance,
            'editPermission' => $ownCommunityMember->getOwner()
        ]);
    }

+    public function getCommunitySettings(): ?IContent
+    {
+        if (!$this->checkPermission(\Container::$request->query('communityId'), false, $community, $ownCommunityMember)) {
+            return null;
+        }
+
+        return new HtmlContent('communities/community_settings', [
+            'community' => $community,
+            'members' => $this->getMembers($community),
+            'currencies' => $this->getCurrencies($community),
+            'editPermission' => $ownCommunityMember->getOwner()
+        ]);
+    }
+
    public function getCommunityNew(): IContent
    {
        return new HtmlContent('communities/community_edit');
--- a/src/Controller/TransactionController.php
+++ b/src/Controller/TransactionController.php
@ -86,6 +86,7 @@ class TransactionController implements IAuthenticationRequired, ISecured
            'exchangeRateCalculator' => $exchangeRateCalculator,
            'pages' => $pages,
            'currentPage' => $currentPage,
+            'numberOfTransactions' => $numberOfTransactions,
            'transactions' => $transactions
        ]);
    }
--- a/views/communities/community.php
+++ b/views/communities/community.php
@ -1,35 +1,16 @@
@extends(templates/layout_normal)

@section(main)
-    <h2><?= $community->getName() ?> <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community-edit')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span></h2>
+    <h2>
+        <?= $community->getName() ?>
+        <?php if ($editPermission): ?>
+            <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community-edit')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span>
+        <?php endif; ?>
+    </h2>
+
+    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.settings')->generateLink(['communityId' => $community->getId()]) ?>">Settings</a></p>

    <div class="gridContainer marginTop">
-        <div>
-            <h3 class="marginBottom">Members</h3>
-            <?php foreach ($members as $member): ?>
-                <p><?= $member->getUser()->getDisplayName() ?></p>
-            <?php endforeach; ?>
-            <?php if ($editPermission): ?>
-                <hr>
-                <p><a href="<?= Container::$routeCollection->getRoute('community-members')->generateLink(['communityId' => $community->getId()]) ?>">Edit members</a></p>
-            <?php endif; ?>
-        </div>
-        <div>
-            <h3 class="marginBottom">Currencies</h3>
-            <?php foreach ($currencies as $currency): ?>
-                <p>
-                    <?php if ($currency->getId() === $community->getMainCurrencyId()): ?>
-                        <b><?= $currency->getCode() ?></b>
-                    <?php else: ?>
-                        <a href="<?= Container::$routeCollection->getRoute('community-currency-exchange-rates')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode()]) ?>"><?= $currency->getCode() ?></a>
-                    <?php endif; ?>
-                </p>
-            <?php endforeach; ?>
-            <?php if ($editPermission): ?>
-                <hr>
-                <p><a href="<?= Container::$routeCollection->getRoute('community-currencies')->generateLink(['communityId' => $community->getId()]) ?>">Edit currencies</a></p>
-            <?php endif; ?>
-        </div>
        <div>
            <h3 class="marginBottom">Upcoming events</h3>
            <?php if (count($upcomingEvents) > 0): ?>
@ -52,20 +33,20 @@
                    <td class="bold">You owe</td>
                    <td class="mono red" style="text-align: right;"><?= number_format($debtBalance, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
                </tr>
-                <?php foreach ($debtUsers as $owe): ?>
+                <?php foreach ($debtItems as $item): ?>
                    <tr>
-                        <td class="small"><?= $owe['payee']->getUser()->getDisplayName() ?></td>
-                        <td class="small mono red" style="text-align: right;"><?= number_format($owe['amount'], $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
+                        <td class="small"><?= $item['payee']->getUser()->getDisplayName() ?></td>
+                        <td class="small mono red" style="text-align: right;"><?= number_format($item['amount'], $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
                    </tr>
                <?php endforeach; ?>
                <tr>
                    <td class="bold">You're owed</td>
                    <td class="mono green" style="text-align: right;"><?= number_format($outstandingBalance, $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
                </tr>
-                <?php foreach ($outstandingUsers as $owe): ?>
+                <?php foreach ($outstandingItems as $item): ?>
                    <tr>
-                        <td class="small"><?= $owe['payer']->getUser()->getDisplayName() ?></td>
-                        <td class="small mono green" style="text-align: right;"><?= number_format($owe['amount'], $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
+                        <td class="small"><?= $item['payer']->getUser()->getDisplayName() ?></td>
+                        <td class="small mono green" style="text-align: right;"><?= number_format($item['amount'], $mainCurrencyRoundDigits) ?> <?= $mainCurrencyCode ?></td>
                    </tr>
                <?php endforeach; ?>
                <tr>
--- a/views/communities/community_currencies.php
+++ b/views/communities/community_currencies.php
@ -3,6 +3,7 @@
@section(main)
    <h2>
        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+        <a href="<?= Container::$routeCollection->getRoute('community.settings')->generateLink(['communityId' => $community->getId()]) ?>">Settings</a> »
        Edit currencies
    </h2>
    <div class="box compactBox">
--- a/views/communities/community_members.php
+++ b/views/communities/community_members.php
@ -7,6 +7,7 @@
@section(main)
    <h2>
        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+        <a href="<?= Container::$routeCollection->getRoute('community.settings')->generateLink(['communityId' => $community->getId()]) ?>">Settings</a> »
        Edit members
    </h2>
    <div class="box compactBox">
--- a/views/communities/community_settings.php
+++ b/views/communities/community_settings.php
@ -0,0 +1,39 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>
+        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+        Settings
+    </h2>
+
+    <div class="gridContainer marginTop">
+        <div>
+            <h3 class="marginBottom">
+                Members
+                <?php if ($editPermission): ?>
+                    <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community-members')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span>
+                <?php endif; ?>
+            </h3>
+            <?php foreach ($members as $member): ?>
+                <p><?= $member->getUser()->getDisplayName() ?></p>
+            <?php endforeach; ?>
+        </div>
+        <div>
+            <h3 class="marginBottom">
+                Currencies
+                <?php if ($editPermission): ?>
+                    <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community-currencies')->generateLink(['communityId' => $community->getId()]) ?>">edit</a>]</span>
+                <?php endif; ?>
+            </h3>
+            <?php foreach ($currencies as $currency): ?>
+                <p>
+                    <?php if ($currency->getId() === $community->getMainCurrencyId()): ?>
+                        <b><?= $currency->getCode() ?></b>
+                    <?php else: ?>
+                        <a href="<?= Container::$routeCollection->getRoute('community-currency-exchange-rates')->generateLink(['communityId' => $community->getId(), 'code' => $currency->getCode()]) ?>"><?= $currency->getCode() ?></a>
+                    <?php endif; ?>
+                </p>
+            <?php endforeach; ?>
+        </div>
+    </div>
+@endsection
--- a/views/communities/currency_exchange_rates.php
+++ b/views/communities/currency_exchange_rates.php
@ -3,6 +3,7 @@
@section(main)
    <h2>
        <a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a> »
+        <a href="<?= Container::$routeCollection->getRoute('community.settings')->generateLink(['communityId' => $community->getId()]) ?>">Settings</a> »
        Exchange rates for <?= $currency->getCode() ?>
    </h2>
    <div class="box compactBox">
--- a/views/communities/transactions.php
+++ b/views/communities/transactions.php
@ -8,55 +8,61 @@

    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communityId' => $community->getId()]) ?>">New transaction</a></p>

-    <?php if ($pages > 1): ?>
-        <p class="paginateContainer marginTop">
-            <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => 0]) ?>">«</a>
-            <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => max(0, $currentPage - 1)]) ?>">‹</a>
-            <?php for ($i = 0; $i < $pages; $i++): ?>
-                <?php if ($currentPage == $i): ?>
-                    <span class="selected"><?= $i + 1 ?></span>
-                <?php else: ?>
-                    <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
-                <?php endif; ?>
-            <?php endfor; ?>
-            <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
-            <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $pages - 1]) ?>">»</a>
-        </p>
-    <?php endif; ?>
+    <?php if ($numberOfTransactions > 0): ?>
+        <?php if ($pages > 1): ?>
+            <p class="paginateContainer marginTop">
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => 0]) ?>">«</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => max(0, $currentPage - 1)]) ?>">‹</a>
+                <?php for ($i = 0; $i < $pages; $i++): ?>
+                    <?php if ($currentPage == $i): ?>
+                        <span class="selected"><?= $i + 1 ?></span>
+                    <?php else: ?>
+                        <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
+                    <?php endif; ?>
+                <?php endfor; ?>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $pages - 1]) ?>">»</a>
+            </p>
+        <?php endif; ?>

-    <?php foreach ($transactions as $transaction): ?>
-        <a class="block" href="<?= Container::$routeCollection->getRoute('community.transactions.edit')->generateLink(['communityId' => $community->getId(), 'transactionId' => $transaction->getId()]) ?>">
-        <div class="box transaction">
-            <div>
-                <p style="font-weight: bold;"><?= $transaction->getDescription() ?></p>
-                <p class="small"><?= $transaction->getPayerUser()->getDisplayName() ?> ► <?= $transaction->getPayeeUser() ? $transaction->getPayeeUser()->getDisplayName() : '[common]' ?></p>
-                <p class="small"><?= $transaction->getTimeDate()->format('Y-m-d H:i') ?></p>
-            </div>
-            <div style="text-align: right;">
-                <h3><?= number_format($exchangeRateCalculator->calculate($transaction->getSum(), $transaction->getCurrency(), $transaction->getTimeDate()), $community->getMainCurrency()->getRoundDigits()) ?> <?= $community->getMainCurrency()->getCode() ?></h3>
-                <?php if ($community->getMainCurrencyId() !== $transaction->getCurrencyId()): ?>
-                    <p style="color: #8e8e8e; font-weight: bold;"><?= number_format($transaction->getSum(), $transaction->getCurrency()->getRoundDigits()) ?> <?= $transaction->getCurrency()->getCode() ?></p>
-                <?php endif; ?>
+        <?php foreach ($transactions as $transaction): ?>
+            <a class="block" href="<?= Container::$routeCollection->getRoute('community.transactions.edit')->generateLink(['communityId' => $community->getId(), 'transactionId' => $transaction->getId()]) ?>">
+            <div class="box transaction">
+                <div>
+                    <p style="font-weight: bold;"><?= $transaction->getDescription() ?></p>
+                    <p class="small"><?= $transaction->getPayerUser()->getDisplayName() ?> ► <?= $transaction->getPayeeUser() ? $transaction->getPayeeUser()->getDisplayName() : '[common]' ?></p>
+                    <p class="small"><?= $transaction->getTimeDate()->format('Y-m-d H:i') ?></p>
+                </div>
+                <div style="text-align: right;">
+                    <h3><?= number_format($exchangeRateCalculator->calculate($transaction->getSum(), $transaction->getCurrency(), $transaction->getTimeDate()), $community->getMainCurrency()->getRoundDigits()) ?> <?= $community->getMainCurrency()->getCode() ?></h3>
+                    <?php if ($community->getMainCurrencyId() !== $transaction->getCurrencyId()): ?>
+                        <p style="color: #8e8e8e; font-weight: bold;"><?= number_format($transaction->getSum(), $transaction->getCurrency()->getRoundDigits()) ?> <?= $transaction->getCurrency()->getCode() ?></p>
+                    <?php endif; ?>
+                </div>
            </div>
+            </a>
+        <?php endforeach; ?>
+
+        <?php if ($pages > 1): ?>
+            <p class="paginateContainer marginTop">
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => 0]) ?>">«</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => max(0, $currentPage - 1)]) ?>">‹</a>
+                <?php for ($i = 0; $i < $pages; $i++): ?>
+                    <?php if ($currentPage == $i): ?>
+                        <span class="selected"><?= $i + 1 ?></span>
+                    <?php else: ?>
+                        <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
+                    <?php endif; ?>
+                <?php endfor; ?>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $pages - 1]) ?>">»</a>
+            </p>
+        <?php endif; ?>
+
+        <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communityId' => $community->getId()]) ?>">New transaction</a></p>
+    <?php else: ?>
+        <div class="box">
+            <p>There are no transactions yet.</p>
        </div>
-        </a>
-    <?php endforeach; ?>
-
-    <?php if ($pages > 1): ?>
-        <p class="paginateContainer marginTop">
-            <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => 0]) ?>">«</a>
-            <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => max(0, $currentPage - 1)]) ?>">‹</a>
-            <?php for ($i = 0; $i < $pages; $i++): ?>
-                <?php if ($currentPage == $i): ?>
-                    <span class="selected"><?= $i + 1 ?></span>
-                <?php else: ?>
-                    <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
-                <?php endif; ?>
-            <?php endfor; ?>
-            <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
-            <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communityId' => $community->getId(), 'page' => $pages - 1]) ?>">»</a>
-        </p>
    <?php endif; ?>
-
-    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communityId' => $community->getId()]) ?>">New transaction</a></p>
@endsection
--- a/views/home.php
+++ b/views/home.php
@ -3,7 +3,10 @@
@section(main)
    <div class="gridContainer">
        <div>
-            <h3 class="marginBottom">Communities</h3>
+            <h3 class="marginBottom">
+                Communities
+                <span class="small">[<a href="<?= Container::$routeCollection->getRoute('community-new')->generateLink() ?>">new</a>]</span>
+            </h3>
            <?php if (count($communities) > 0): ?>
                <?php foreach ($communities as $community): ?>
                    <p><a href="<?= Container::$routeCollection->getRoute('community')->generateLink(['communityId' => $community->getId()]) ?>"><?= $community->getName() ?></a></p>
@ -11,8 +14,6 @@
            <?php else: ?>
                <p>You have no community.</p>
            <?php endif; ?>
-            <hr>
-            <p><a href="<?= Container::$routeCollection->getRoute('community-new')->generateLink() ?>">New community</a></p>
        </div>
        <div>
            <h3 class="marginBottom">Upcoming events</h3>
--- a/web.php
+++ b/web.php
@ -61,6 +61,7 @@ Container::$routeCollection->group('communities', function (RouteCollection $rou
    $routeCollection->post('community-new-action', 'new', [CommunityController::class, 'saveCommunity']);
    $routeCollection->group('{communityId}', function (RouteCollection $routeCollection) {
        $routeCollection->get('community', '', [CommunityController::class, 'getCommunityHome']);
+        $routeCollection->get('community.settings', 'settings', [CommunityController::class, 'getCommunitySettings']);
        $routeCollection->get('community-edit', 'edit', [CommunityController::class, 'getCommunityEdit']);
        $routeCollection->post('community-edit-action', 'edit', [CommunityController::class, 'saveCommunity']);
        $routeCollection->get('community-members', 'members', [CommunityController::class, 'getMembersEdit']);
Author	SHA1	Message	Date
Bence Pőcze	2da0ccb09b	Merge pull request 'feature/layout-improvements' (!38 ) from feature/layout-improvements into master All checks were successful rvr-nextgen/pipeline/head This commit looks good Details Reviewed-on: #38	2023-05-01 23:42:30 +02:00
Pőcze Bence	584fcaba39	make community layout clearer All checks were successful rvr-nextgen/pipeline/pr-master This commit looks good Details	2023-05-01 23:37:30 +02:00
Pőcze Bence	b5dc96f98b	fix stupid variable names	2023-05-01 23:02:57 +02:00