Skip to content

fix: List #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2025
Merged

fix: List #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/goapp/public/components/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions src/goapp/templates/myapprovals.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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">
Expand Down Expand Up @@ -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>
Expand All @@ -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">
Expand All @@ -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">
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/goapp/templates/myrequests.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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">
Expand Down Expand Up @@ -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>
Expand All @@ -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">
Expand All @@ -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">
Expand Down Expand Up @@ -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
Expand Down