diff --git a/src/routes/backoffice/project/+page.svelte b/src/routes/backoffice/project/+page.svelte index 8b7cb1d..6af0b51 100644 --- a/src/routes/backoffice/project/+page.svelte +++ b/src/routes/backoffice/project/+page.svelte @@ -17,6 +17,7 @@ type insertProject = { issue_id: string; input_by: string; + project_start_date?: string; project_due_date: string; picture_link: string; updated_at?: string; // Optional, if not always present @@ -36,6 +37,7 @@ issue_number: string; issue_id: string; report_date: string; + project_start_date?: string; project_due_date: string; project_number?: string; // Optional, if not always present assigned_name?: string; // Optional, if not always present @@ -98,8 +100,10 @@ let showProjectEditModal = false; let projectEditForm = { project_number: "", - issue_id: "", + issue_desc: "", project_name: "", + project_start_date:"", + project_due_date:"", project_status: "On Progress", project_comment: "", picture_link: "", @@ -111,8 +115,10 @@ function openProjectEditModal(row) { projectEditForm = { project_number: row.project_number || "", - issue_id: row.issue_id || "", + issue_desc: row.issue_name || "", project_name: row.project_name || "", + project_start_date: row.project_start_date || "", + project_due_date: row.project_due_date || "", project_status: row.project_status || "On Progress", project_comment: row.project_comment || "", picture_link: row.picture_link || "", @@ -155,7 +161,8 @@ const { data, error } = await supabase .from("vb_employee") .select("id, employee_name, employee_status") - .eq("employee_status", "Active"); + .eq("employee_status", "Active") + .order("employee_name", { ascending: true }); if (error) { console.error("Error fetching employees:", error); @@ -618,6 +625,8 @@ project_comment: projectEditForm.project_comment, picture_link: projectEditForm.picture_link, assigned_to: projectEditForm.assigned_to, + project_start_date: projectEditForm.project_start_date, + project_due_date: projectEditForm.project_due_date, updated_at: formattedDate, updated_by: user.id // ✅ real user info }) @@ -1134,59 +1143,75 @@ {#if showProjectEditModal}