diff --git a/src/app.css b/src/app.css index a461c50..9bdbe7e 100644 --- a/src/app.css +++ b/src/app.css @@ -1 +1,4 @@ -@import "tailwindcss"; \ No newline at end of file +@import "tailwindcss"; +table td { + vertical-align: top; +} \ No newline at end of file diff --git a/src/routes/backoffice/timesheets/+page.svelte b/src/routes/backoffice/timesheets/+page.svelte index 70035f1..99c29cf 100644 --- a/src/routes/backoffice/timesheets/+page.svelte +++ b/src/routes/backoffice/timesheets/+page.svelte @@ -191,6 +191,7 @@ .order("villa_name", { ascending: true }); if (!villaErr && villaData) { + dataVilla = villaData; villas = villaData; } else { console.error("Failed to load villas", villaErr); @@ -282,7 +283,7 @@ } // Function to fetch timesheets with optional filters and sorting async function fetchTimeSheets( - villaNameFilter: string | null = null, + villaIdFilter: string | null = null, searchTerm: string | null = null, sortColumn: string | null = "created_at", sortOrder: "asc" | "desc" = "desc", @@ -295,11 +296,11 @@ .order(sortColumn || "created_at", { ascending: sortOrder === "asc", }); - if (villaNameFilter) { + if (villaIdFilter) { const { data: villaMatch } = await supabase .from("vb_villas") .select("id") - .eq("villa_name", villaNameFilter); + .eq("villa_name", villaIdFilter); const matchedId = villaMatch?.[0]?.id; if (matchedId) { @@ -622,7 +623,7 @@ {/if} {:else if col.key === "approved_by"} - + {row[col.key] || "Not Approved"} {:else if col.key === "approved_date"}