- {new Date(contract.date_signed).toLocaleDateString( - "en-US" - )} + {formatDate(contract.date_signed)}
- {new Date(contract.finish_date).toLocaleDateString( - "en-US" - )} + {formatDate(contract.finish_date)}
- Due: {project.finish_date} + Due: {formatDate(project.finish_date)}
)} diff --git a/src/app/projects/[id]/page.js b/src/app/projects/[id]/page.js index 868904c..dadcc4b 100644 --- a/src/app/projects/[id]/page.js +++ b/src/app/projects/[id]/page.js @@ -9,6 +9,7 @@ import Button from "@/components/ui/Button"; import Badge from "@/components/ui/Badge"; import Link from "next/link"; import { differenceInCalendarDays, parseISO } from "date-fns"; +import { formatDate } from "@/lib/utils"; import PageContainer from "@/components/ui/PageContainer"; import PageHeader from "@/components/ui/PageHeader"; import ProjectStatusDropdown from "@/components/ProjectStatusDropdown"; @@ -172,13 +173,15 @@ export default async function ProjectViewPage({ params }) {{project.unit || "N/A"}
- + {" "}- {project.finish_date || "N/A"} + {project.finish_date + ? formatDate(project.finish_date) + : "N/A"}
{note.note} -
+ {" "}- {new Date( - note.note_date - ).toLocaleDateString()}{" "} - at{" "} - {new Date( - note.note_date - ).toLocaleTimeString()} + {formatDate(note.note_date, { + includeTime: true, + })}
{!note.is_system && ( diff --git a/src/lib/utils.js b/src/lib/utils.js index 4800018..12d3db7 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -1,40 +1,90 @@ // Test utilities for deadline and status formatting export const getDeadlineVariant = (days) => { - if (days < 0) return "danger"; - if (days <= 7) return "warning"; - return "success"; + if (days < 0) return "danger"; + if (days <= 7) return "warning"; + return "success"; }; export const formatProjectStatus = (status) => { - switch (status) { - case "registered": - return "Zarejestrowany"; - case "in_progress_design": - return "W realizacji (projektowanie)"; - case "in_progress_construction": - return "W realizacji (realizacja)"; - case "fulfilled": - return "Zakończony"; - default: - return "-"; - } + switch (status) { + case "registered": + return "Zarejestrowany"; + case "in_progress_design": + return "W realizacji (projektowanie)"; + case "in_progress_construction": + return "W realizacji (realizacja)"; + case "fulfilled": + return "Zakończony"; + default: + return "-"; + } }; export const formatProjectType = (type) => { - switch (type) { - case "design": - return "Projektowanie"; - case "construction": - return "Realizacja"; - case "design+construction": - return "Projektowanie + Realizacja"; - default: - return "-"; - } + switch (type) { + case "design": + return "Projektowanie"; + case "construction": + return "Realizacja"; + case "design+construction": + return "Projektowanie + Realizacja"; + default: + return "-"; + } }; export const getDeadlineText = (daysRemaining) => { - if (daysRemaining === 0) return "Due Today"; - if (daysRemaining > 0) return `${daysRemaining} days left`; - return `${Math.abs(daysRemaining)} days overdue`; + if (daysRemaining === 0) return "Due Today"; + if (daysRemaining > 0) return `${daysRemaining} days left`; + return `${Math.abs(daysRemaining)} days overdue`; +}; + +export const formatDate = (date, options = {}) => { + if (!date) return ""; + + try { + const dateObj = typeof date === "string" ? new Date(date) : date; + + if (isNaN(dateObj.getTime())) { + return "Invalid date"; + } + + // Default to DD.MM.YYYY format + const day = String(dateObj.getDate()).padStart(2, "0"); + const month = String(dateObj.getMonth() + 1).padStart(2, "0"); + const year = dateObj.getFullYear(); + + if (options.includeTime) { + const hours = String(dateObj.getHours()).padStart(2, "0"); + const minutes = String(dateObj.getMinutes()).padStart(2, "0"); + return `${day}.${month}.${year} ${hours}:${minutes}`; + } + + return `${day}.${month}.${year}`; + } catch (error) { + console.error("Error formatting date:", error); + return "Invalid date"; + } +}; + +export const formatDateForInput = (date) => { + if (!date) return ""; + + try { + const dateObj = typeof date === "string" ? new Date(date) : date; + + if (isNaN(dateObj.getTime())) { + return ""; + } + + // Format as YYYY-MM-DD for HTML date inputs + const year = dateObj.getFullYear(); + const month = String(dateObj.getMonth() + 1).padStart(2, "0"); + const day = String(dateObj.getDate()).padStart(2, "0"); + + return `${year}-${month}-${day}`; + } catch (error) { + console.error("Error formatting date for input:", error); + return ""; + } };