siteworxpro/reloading-manager
1
Fork 0
Code Pull Requests Actions Releases 3 Activity

IEize (#31)

Browse Source 
Reviewed-on: rrise/reloading-manager#31
Co-authored-by: Ron Rise <ron@siteworxpro.com>
Co-committed-by: Ron Rise <ron@siteworxpro.com>
This commit is contained in:
Ron Rise
2025-04-18 20:03:59 -04:00
committed by Siteworx Pro Gitea
parent b3d2444f3f
commit 6a6d9b5b48
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/handlers/loads/handler.go
View File

@@ -339,7 +339,7 @@ func getQuery(c echo.Context, countOnly bool) postgres.SelectStatement {
if c.QueryParam("bullet_manufacturer_id") != "" {
ids := strings.Split(c.QueryParam("bullet_manufacturer_id"), ",")
if len(ids) > 0 {
expressions = append(expressions, ctg.ID.IN(getUuidExpr(ids)...))
expressions = append(expressions, bm.ID.IN(getUuidExpr(ids)...))
}
}
@@ -420,7 +420,7 @@ func getQuery(c echo.Context, countOnly bool) postgres.SelectStatement {
sort = p.Name
case "powder_manufacturer_name":
sort = pwdm.Name
case "powder_namd":
case "powder_name":
sort = pwd.Name
case "powder_grs":
sort = l.PowderGr
@@ -428,7 +428,7 @@ func getQuery(c echo.Context, countOnly bool) postgres.SelectStatement {
sort = ctg.Name
}
if c.QueryParam("sortOrder") == "-1" {
if c.QueryParam("sortOrder") == "desc" {
q.ORDER_BY(sort.DESC())
} else {
q.ORDER_BY(sort.ASC())

36
frontend/src/pages/loads/Search.vue
View File

@@ -153,29 +153,33 @@ const loads = ref<Load[]>([])
const total = ref(0)
const loading = ref(true)
const sortField = ref('cartridge_name')
const sortOrder = ref<number | undefined>(-1)
// use local storage to store the selected filters
const localStorageKey = 'load-filters'
const localStorageFilters = JSON.parse(localStorage.getItem(localStorageKey) ?? "{}")
const sortField = ref(localStorageFilters.sortField ?? 'cartridge_name')
const sortOrder = ref<number | undefined>(localStorageFilters.sortOrder ?? -1)
const cartridgeOptions = ref<Option[]>([])
const cartridgeSelected = ref<string[]>([])
const cartridgeSelected = ref<string[]>(localStorageFilters.cartridgeSelected ?? [])
const bulletManufacturerOptions = ref<Option[]>([])
const bulletManufacturerSelected = ref<string[]>([])
const bulletManufacturerSelected = ref<string[]>(localStorageFilters.bulletManufacturerSelected ?? [])
const bulletOptions = ref<Option[]>([])
const bulletSelected = ref<string[]>([])
const bulletSelected = ref<string[]>(localStorageFilters.bulletSelected ?? [])
const primerManufacturerOptions = ref<Option[]>([])
const primerManufacturerSelected = ref<string[]>([])
const primerManufacturerSelected = ref<string[]>(localStorageFilters.primerManufacturerSelected ?? [])
const primerOptions = ref<Option[]>([])
const primerSelected = ref<string[]>([])
const primerSelected = ref<string[]>(localStorageFilters.primerSelected ?? [])
const powderManufacturerOptions = ref<Option[]>([])
const powderManufacturerSelected = ref<string[]>([])
const powderManufacturerSelected = ref<string[]>(localStorageFilters.powderManufacturerSelected ?? [])
const powderOptions = ref<Option[]>([])
const powderSelected = ref<string[]>([])
const powderSelected = ref<string[]>(localStorageFilters.powderSelected ?? [])
const fetchLoads = async () => {
loading.value = true
@@ -185,7 +189,7 @@ const fetchLoads = async () => {
searchParams.unshift(`sortField=${sortField.value}`)
if (sortOrder.value) {
searchParams.unshift(`sortOrder=${sortOrder.value}`)
searchParams.unshift(`sortOrder=${sortOrder.value === 1 ? 'asc' : 'desc'}`)
}
if (cartridgeSelected.value.length > 0) {
@@ -216,6 +220,18 @@ const fetchLoads = async () => {
searchParams.unshift(`powder_id=${powderSelected.value.join(',')}`)
}
localStorage.setItem(localStorageKey, JSON.stringify({
cartridgeSelected: cartridgeSelected.value,
bulletManufacturerSelected: bulletManufacturerSelected.value,
bulletSelected: bulletSelected.value,
primerManufacturerSelected: primerManufacturerSelected.value,
primerSelected: primerSelected.value,
powderManufacturerSelected: powderManufacturerSelected.value,
powderSelected: powderSelected.value,
sortField: sortField.value,
sortOrder: sortOrder.value,
}))
const resp = await axios.get<any, Response<LoadResponse>>(
`${import.meta.env.VITE_API}/load?${searchParams.join('&')}`)