diff options
Diffstat (limited to 'src/routes')
| -rw-r--r-- | src/routes/groceries/+page.server.ts | 14 | ||||
| -rw-r--r-- | src/routes/groceries/+page.svelte | 30 | ||||
| -rw-r--r-- | src/routes/groceries/catalog/+page.server.ts | 13 | ||||
| -rw-r--r-- | src/routes/groceries/catalog/+page.svelte | 33 |
4 files changed, 12 insertions, 78 deletions
diff --git a/src/routes/groceries/+page.server.ts b/src/routes/groceries/+page.server.ts index e462ab2..d0e0759 100644 --- a/src/routes/groceries/+page.server.ts +++ b/src/routes/groceries/+page.server.ts @@ -2,11 +2,10 @@ import { fail, redirect, error } from '@sveltejs/kit'; import { loadUnchecked, loadAll, - toggle, addOrUncheck, } from '$lib/server/services/groceries'; +import { toggleGroceryAction } from '$lib/server/services/grocery-actions'; import { - numericId, parseFormString, parseOptionalNumber, } from '$lib/server/services/validation'; @@ -45,16 +44,7 @@ export const actions: Actions = { return { success: true, items }; }, - toggle: async ({ request }) => { - const data = await request.formData(); - try { - const id = numericId(data.get('id')); - await toggle(id); - } catch { - return fail(400, { error: 'ID invalide' }); - } - return { success: true }; - }, + toggle: ({ request }) => toggleGroceryAction(request), addAndEdit: async ({ request }) => { const data = await request.formData(); diff --git a/src/routes/groceries/+page.svelte b/src/routes/groceries/+page.svelte index 4471738..a159209 100644 --- a/src/routes/groceries/+page.svelte +++ b/src/routes/groceries/+page.svelte @@ -3,6 +3,8 @@ import { goto } from '$app/navigation'; import { enhance } from '$app/forms'; import FuzzyAutocomplete from '$lib/components/FuzzyAutocomplete.svelte'; + import BestRef from '$lib/components/BestRef.svelte'; + import { groupByCategory } from '$lib/shared/group-by-category'; import type { EnrichedGrocery } from '$lib/server/services/groceries'; let { data, form } = $props(); @@ -15,21 +17,6 @@ localItems = data?.items ?? []; }); - function groupByCategory(items: typeof localItems) { - const groups: Record<string, typeof localItems> = {}; - for (const item of items) { - const key = item.categoryName ?? 'Non catégorisé'; - (groups[key] ??= []).push(item); - } - const result: [string, typeof localItems][] = data.categories - .filter((cat) => groups[cat.name]?.length > 0) - .map((cat) => [cat.name, groups[cat.name]]); - if (groups['Non catégorisé']?.length > 0) { - result.unshift(['Non catégorisé', groups['Non catégorisé']]); - } - return result; - } - async function handleAdd(redirectToEdit: boolean) { if (!name.trim()) { addError = 'Le nom est requis'; @@ -105,7 +92,7 @@ <p class="empty">Rien à acheter</p> {:else} <form method="POST" action="?/toggle" use:enhance> - {#each groupByCategory(localItems) as [cat, items] (cat)} + {#each groupByCategory(localItems, data.categories) as [cat, items] (cat)} <h3 class="category-name">{cat}</h3> <ul class="item-list"> {#each items as item (item.id)} @@ -120,16 +107,7 @@ <span class="item-text"> {item.name} {#if item.bestRef} - <span class="best-ref" - >{item.bestRef.reference} - {#if item.bestRef.price && item.bestRef.unit} - {item.bestRef.price.toFixed(2)} - {item.bestRef.unit} - {/if} - {#if item.bestRef.qualityScore != null} - ({item.bestRef.qualityScore}/100) - {/if} - </span> + <BestRef ref={item.bestRef} /> {/if} </span> </button> diff --git a/src/routes/groceries/catalog/+page.server.ts b/src/routes/groceries/catalog/+page.server.ts index 22464dc..fd71e30 100644 --- a/src/routes/groceries/catalog/+page.server.ts +++ b/src/routes/groceries/catalog/+page.server.ts @@ -1,9 +1,9 @@ import { fail } from '@sveltejs/kit'; import { loadAll, - toggle, bulkUpdateGroceryCategory, } from '$lib/server/services/groceries'; +import { toggleGroceryAction } from '$lib/server/services/grocery-actions'; import { numericId, parseOptionalNumber, @@ -22,16 +22,7 @@ export const load: PageServerLoad = async () => { }; export const actions: Actions = { - toggle: async ({ request }) => { - const data = await request.formData(); - try { - const id = numericId(data.get('id')); - await toggle(id); - } catch { - return fail(400, { error: 'ID invalide' }); - } - return { success: true }; - }, + toggle: ({ request }) => toggleGroceryAction(request), bulkUpdateCategory: async ({ request }) => { const data = await request.formData(); diff --git a/src/routes/groceries/catalog/+page.svelte b/src/routes/groceries/catalog/+page.svelte index 4cbcc27..74a82e8 100644 --- a/src/routes/groceries/catalog/+page.svelte +++ b/src/routes/groceries/catalog/+page.svelte @@ -1,6 +1,8 @@ <script lang="ts"> import { enhance } from '$app/forms'; import { SvelteSet } from 'svelte/reactivity'; + import BestRef from '$lib/components/BestRef.svelte'; + import { groupByCategory } from '$lib/shared/group-by-category'; let { data, form } = $props(); @@ -20,24 +22,6 @@ if (selectedIds.has(id)) selectedIds.delete(id); else selectedIds.add(id); } - - function groupByCategory(items: typeof catalogItems) { - const groups: Record<string, typeof catalogItems> = {}; - for (const item of items) { - const key = item.categoryName ?? 'Non catégorisé'; - (groups[key] ??= []).push(item); - } - const result: [string, typeof catalogItems][] = []; - for (const cat of data.categories) { - if (groups[cat.name]?.length > 0) { - result.push([cat.name, groups[cat.name]]); - } - } - if (groups['Non catégorisé']?.length > 0) { - result.unshift(['Non catégorisé', groups['Non catégorisé']]); - } - return result; - } </script> {#if catalogItems.length > 0} @@ -91,7 +75,7 @@ <p class="empty">Aucun résultat</p> {:else} <form method="POST" action="?/toggle" use:enhance> - {#each groupByCategory(filteredItems) as [cat, items] (cat)} + {#each groupByCategory(filteredItems, data.categories) as [cat, items] (cat)} <h3 class="category-name">{cat}</h3> <ul class="item-list"> {#each items as item (item.id)} @@ -112,16 +96,7 @@ <span class="item-text"> <span class:checked={item.checked}>{item.name}</span> {#if item.bestRef} - <span class="best-ref" - >{item.bestRef.reference} - {#if item.bestRef.price && item.bestRef.unit} - {item.bestRef.price.toFixed(2)} - {item.bestRef.unit} - {/if} - {#if item.bestRef.qualityScore != null} - ({item.bestRef.qualityScore}/100) - {/if} - </span> + <BestRef ref={item.bestRef} /> {/if} </span> </button> |