Merge pull request #71 from deanblackborough/main

Minor fixes
costs-to-expect · Mar 1, 2023 · ae24fb6 · ae24fb6
2 parents 5c070aa + d7e5af4
commit ae24fb6
Show file tree

Hide file tree

Showing 18 changed files with 294 additions and 281 deletions.
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -117,7 +117,7 @@ protected function getBudgetItems(): array
             $this->resource_type_id,
             $this->resource_id,
             [
-                'limit' => 50,
+                'limit' => 100,
                 'sort' => 'amount:desc|created:asc',
             ]
         );

diff --git a/composer.lock b/composer.lock
diff --git a/config/app/config.php b/config/app/config.php
@@ -11,8 +11,8 @@
     'item_subtype_id' => env('ITEM_SUBTYPE_ID'),
     'cookie_user' => env('SESSION_NAME_USER'),
     'cookie_bearer' => env('SESSION_NAME_BEARER'),
-    'version' => 'v1.10.1',
-    'release_date' => '16th February 2023',
+    'version' => 'v1.10.2',
+    'release_date' => '1st March 2023',
     'exception_notification_email' => env('EXCEPTION_NOTIFICATION_EMAIL'),
     'timezone' => 'UTC', // We can allow users to override this later
 ];
diff --git a/public/js/filter-budget-by-account.js b/public/js/filter-budget-by-account.js
diff --git a/public/js/toggle-paid.js → public/js/view-controls.js b/public/js/toggle-paid.js → public/js/view-controls.js
@@ -2,12 +2,20 @@
     'use strict'
 
     let show_paid = localStorage.getItem('show_paid');
+    let account_id = localStorage.getItem('account_id');
 
-    if (show_paid === null) {
+    if (show_paid === null)
+    {
         show_paid = 'true';
     }
 
-    let toggleVisibility = function() {
+    if (account_id === null)
+    {
+        account_id = '';
+    }
+
+    let togglePaidStatus = function()
+    {
         if (show_paid === 'true') {
             show_paid = 'false';
             localStorage.setItem('show_paid', show_paid);
@@ -16,21 +24,48 @@
             localStorage.setItem('show_paid', show_paid);
         }
 
-        setItemVisibility(show_paid);
+        setVisibleItems(show_paid, account_id);
         setToggleButtonText(show_paid);
     }
 
-    const setItemVisibility = function(show_paid) {
-        document.querySelectorAll('a.budget-item[data-item-paid]').forEach(function (budget_item) {
-            if (show_paid === 'true') {
-                budget_item.style.display = 'block';
-            } else {
-                budget_item.style.display = 'none';
-            }
-        });
+    let toggleAccountId = function()
+    {
+        account_id = this.value;
+        localStorage.setItem('account_id', account_id);
+
+        setVisibleItems(show_paid, account_id);
+    }
+
+    const setVisibleItems = function(show_paid, account_id)
+    {
+        const items = document.querySelectorAll('a.budget-item');
+
+        if (account_id === '') {
+            items.forEach(function (budget_item) {
+                if (show_paid === 'false' && budget_item.dataset.itemPaid === 'true') {
+                    budget_item.style.display = 'none';
+                } else {
+                    budget_item.style.display = 'block';
+                }
+            });
+        } else {
+            items.forEach(function (budget_item) {
+
+                if (budget_item.dataset.itemAccount === account_id) {
+                    if (show_paid === 'false' && budget_item.dataset.itemPaid === 'true') {
+                        budget_item.style.display = 'none';
+                    } else {
+                        budget_item.style.display = 'block';
+                    }
+                } else {
+                    budget_item.style.display = 'none';
+                }
+            });
+        }
     }
 
-    const setToggleButtonText = function(show_paid) {
+    const setToggleButtonText = function(show_paid)
+    {
         let eye = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-eye" viewBox="0 0 16 16">\n' +
             '<path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>\n' +
             '<path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>\n' +
@@ -49,10 +84,23 @@
         }
     }
 
-    const toggle_control = document.querySelector('button[name="toggle-paid"]');
-    if (toggle_control !== null) {
-        setItemVisibility(show_paid)
+    const setAccountFilterValue = function(account_id)
+    {
+        document.querySelector('select[name="account-filter"]').value = account_id;
+    }
+
+    const toggle_paid_status = document.querySelector('button[name="toggle-paid"]');
+    if (toggle_paid_status !== null)
+    {
         setToggleButtonText(show_paid);
-        toggle_control.addEventListener('click', toggleVisibility)
+        setVisibleItems(show_paid, account_id);
+        toggle_paid_status.addEventListener('click', togglePaidStatus);
+    }
+    const account_filter = document.querySelector('select[name="account-filter"]');
+    if (account_filter !== null)
+    {
+        setAccountFilterValue(account_id);
+        setVisibleItems(show_paid, account_id);
+        account_filter.addEventListener('change', toggleAccountId);
     }
 })();
diff --git a/resources/views/budget/account/create.blade.php b/resources/views/budget/account/create.blade.php
@@ -162,7 +162,6 @@
         <script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.js') }}" defer></script>
         <script src="{{ asset('js/auto-format-numbers.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/budget/account/set-balances.blade.php b/resources/views/budget/account/set-balances.blade.php
@@ -114,7 +114,6 @@
         <script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.js') }}" defer></script>
         <script src="{{ asset('js/auto-format-numbers.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/budget/account/update.blade.php b/resources/views/budget/account/update.blade.php
@@ -143,7 +143,6 @@
         <script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.js') }}" defer></script>
         <script src="{{ asset('js/auto-format-numbers.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/budget/item/confirm-delete.blade.php b/resources/views/budget/item/confirm-delete.blade.php
@@ -143,7 +143,6 @@
         </div>
         <script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/budget/item/confirm-disable.blade.php b/resources/views/budget/item/confirm-disable.blade.php
@@ -143,7 +143,6 @@
         </div>
         <script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/budget/item/confirm-enable.blade.php b/resources/views/budget/item/confirm-enable.blade.php
@@ -142,7 +142,6 @@
         </div>
         <script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/budget/item/create-expense.blade.php b/resources/views/budget/item/create-expense.blade.php
@@ -335,7 +335,6 @@
         <script src="{{ asset('js/create-budget-item.js') }}" defer></script>
         <script src="{{ asset('js/auto-format-numbers.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/budget/item/create-income.blade.php b/resources/views/budget/item/create-income.blade.php
@@ -327,7 +327,6 @@
         <script src="{{ asset('js/create-budget-item.js') }}" defer></script>
         <script src="{{ asset('js/auto-format-numbers.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/budget/item/create-saving.blade.php b/resources/views/budget/item/create-saving.blade.php
@@ -346,7 +346,6 @@
         <script src="{{ asset('js/create-budget-item.js') }}" defer></script>
         <script src="{{ asset('js/auto-format-numbers.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/budget/item/index.blade.php b/resources/views/budget/item/index.blade.php
@@ -14,7 +14,7 @@
 
         <x-offcanvas active="home"/>
 
-        <div class="col-lg-8 col-xl-6 mx-auto p-3">
+        <div class="col-lg-10 col-xl-8 col-xxl-8 mx-auto p-3">
 
             <div class="row">
                 <div class="col-12 col-lg-5 mx-auto p-2">
@@ -265,7 +265,6 @@
         <script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.js') }}" defer></script>
         <script src="{{ asset('js/auto-format-numbers.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/budget/item/update.blade.php b/resources/views/budget/item/update.blade.php
@@ -339,7 +339,6 @@
         <script src="{{ asset('js/create-budget-item.js') }}" defer></script>
         <script src="{{ asset('js/auto-format-numbers.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>
diff --git a/resources/views/components/budget.blade.php b/resources/views/components/budget.blade.php
@@ -13,7 +13,7 @@
                                     'item-month' => $__month->month(),
                                     'month'=>  $__month->month(),
                                     'year'=> $__month->year()
-                                ]) }}" class="budget-item" data-item-account="{{ $__item->accountId() }}" data-item-name="{{ $__item->name() }}" @if($__month->now() === true && $__item->paid() === true) data-item-paid=true @endif>
+                                ]) }}" class="budget-item" data-item-account="{{ $__item->accountId() }}" data-item-name="{{ $__item->name() }}" @if($__month->now() === true && $__item->paid() === true) data-item-paid=true @else data-item-paid=false  @endif>
                         <div class="col-12 expense @if ($active_item === $__item->id() && $__month->year() === $active_item_year && $__month->month() === $active_item_month) active shadow @endif" @if($__item->disabled() === true) title="Disabled expense" @endif>
                             <div class="name text-grey" title="{{ $__item->name() }}">
                                 <p class="mb-1">

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
@@ -98,7 +98,6 @@
         </div>
         <script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.js') }}" defer></script>
         <script src="{{ asset('js/filter-budget.js') }}" defer></script>
-        <script src="{{ asset('js/toggle-paid.js') }}" defer></script>
-        <script src="{{ asset('js/filter-budget-by-account.js') }}" defer></script>
+        <script src="{{ asset('js/view-controls.js') }}" defer></script>
     </body>
 </html>