From 6973e55ebd4937e18d2c9b6596b262f4376b42d6 Mon Sep 17 00:00:00 2001
From: Jerrico Dela Cruz <jerri_tan@outlook.com>
Date: Mon, 17 Mar 2025 22:57:02 +0800
Subject: [PATCH] fix: List

Signed-off-by: Jerrico Dela Cruz <jerri_tan@outlook.com>
---
 src/goapp/public/components/list.js  |  5 +++++
 src/goapp/templates/myapprovals.html | 12 ++++++------
 src/goapp/templates/myrequests.html  | 12 ++++++------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/goapp/public/components/list.js b/src/goapp/public/components/list.js
index 7616b42b..f6ab09e0 100644
--- a/src/goapp/public/components/list.js
+++ b/src/goapp/public/components/list.js
@@ -44,6 +44,11 @@ const list = ({
         this.state.showStart = this.state.items.length > 0 ? ((this.state.page * this.state.filter) + 1) : 0;
         this.state.showEnd = (this.state.page * this.state.filter) + this.state.items.length;
     },
+    async reload(){
+        this.state.page = 0;
+        this.state.total = 0;
+        this.load();
+    },
     //EVENT HANDLERS
     onChangeFilterHandler(e){
         this.state.page = 0,
diff --git a/src/goapp/templates/myapprovals.html b/src/goapp/templates/myapprovals.html
index b1efcf1f..8984c44d 100644
--- a/src/goapp/templates/myapprovals.html
+++ b/src/goapp/templates/myapprovals.html
@@ -33,7 +33,7 @@
               <select @change="(e) => {
                 state.other.requestType = requestTypes.find((obj) => { return e.target.value == obj.name})
                 state.other.organization = 'All'
-                load()
+                reload()
               }" 
               id="reponseType" name="responseType" class="block mt-1 pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
                   <template x-for="item in requestTypes" :key="item.id">
@@ -47,7 +47,7 @@
             <div class="content-start">
                 <label for="filter" class="block text-sm font-medium text-gray-700">Filter by Organization</label>
                 <select @change="(e) => {
-                  load()
+                  reload()
                 }"
                 x-model="state.other.organization" 
                 id="reponseType" name="responseType" class="block mt-1 pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
@@ -82,7 +82,7 @@
           <div class="content-start">
               <label for="filter" class="block text-sm font-medium text-gray-700">Filter by Response</label>
               <select @change="() => {
-                load()
+                reload()
               }" 
               x-model="state.other.responseType" id="reponseType" name="responseType" class="block mt-1 pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
                   <option>All</option>
@@ -97,7 +97,7 @@
               <select @change="(e) => {
                 state.other.requestType = requestTypes.find((obj) => { return e.target.value == obj.name})
                 state.other.organization = 'All'
-                load()
+                reload()
               }" 
               id="reponseType" name="responseType" class="block mt-1 pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
                   <template x-for="item in requestTypes" :key="item.id">
@@ -112,7 +112,7 @@
                 <label for="filter" class="block text-sm font-medium text-gray-700">Filter by Organization</label>
                 <select @change="(e) => {
                   state.other.organization = e.target.value
-                  load()
+                  reload()
                 }" 
                 id="reponseType" name="responseType" class="block mt-1 pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
                     <template x-for="item in organizations">
@@ -392,7 +392,7 @@
     const offset = filter * page;
     search = encodeURIComponent(search)
     requestTypeParam = requestType == '' ? '' : '&requestType=' + requestType
-    organizationParam = organization == 'All' ? '' : '&organization=' + organization
+    organizationParam = organization.toLowerCase() == 'all' ? '' : '&organization=' + organization
     const res = await fetch(`/api/items/type/${type}/status/${status}?filter=${filter}&offset=${offset}&search=${search}${requestTypeParam}${organizationParam}`)
     const data = await res.json()
     return data
diff --git a/src/goapp/templates/myrequests.html b/src/goapp/templates/myrequests.html
index 23f0bd07..c036121a 100644
--- a/src/goapp/templates/myrequests.html
+++ b/src/goapp/templates/myrequests.html
@@ -21,7 +21,7 @@
               <select @change="(e) => {
                 state.other.requestType = requestTypes.find((obj) => { return e.target.value == obj.name})
                 state.other.organization = 'All'
-                load()
+                reload()
               }" 
               id="reponseType" name="responseType" class="block mt-1 pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
                   <template x-for="item in requestTypes" :key="item.id">
@@ -35,7 +35,7 @@
             <div class="content-start">
                 <label for="filter" class="block text-sm font-medium text-gray-700">Filter by Organization</label>
                 <select @change="(e) => {
-                  load()
+                  reload()
                 }"
                 x-model="state.other.organization" 
                 id="reponseType" name="responseType" class="block mt-1 pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
@@ -70,7 +70,7 @@
           <div class="content-start">
               <label for="filter" class="block text-sm font-medium text-gray-700">Filter by Response</label>
               <select @change="() => {
-                load()
+                reload()
               }" 
               x-model="state.other.responseType" id="reponseType" name="responseType" class="block mt-1 pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
                   <option>All</option>
@@ -85,7 +85,7 @@
               <select @change="(e) => {
                 state.other.requestType = requestTypes.find((obj) => { return e.target.value == obj.name})
                 state.other.organization = 'All'
-                load()
+                reload()
               }" 
               id="reponseType" name="responseType" class="block mt-1 pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
                   <template x-for="item in requestTypes" :key="item.id">
@@ -99,7 +99,7 @@
             <div class="content-start">
                 <label for="filter" class="block text-sm font-medium text-gray-700">Filter by Organization</label>
                 <select @change="(e) => {
-                  load()
+                  reload()
                 }"
                 x-model="state.other.organization" 
                 id="reponseType" name="responseType" class="block mt-1 pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
@@ -321,7 +321,7 @@
     const offset = filter * page;
     search = encodeURIComponent(search)
     requestTypeParam = requestType == '' ? '' : '&requestType=' + requestType
-    organizationParam = organization == 'All' ? '' : '&organization=' + organization
+    organizationParam = organization.toLowerCase() == 'all' ? '' : '&organization=' + organization
     const res = await fetch(`/api/items/type/${type}/status/${status}?filter=${filter}&offset=${offset}&search=${search}${requestTypeParam}${organizationParam}`)
     const data = await res.json()
     return data