From 3cb7fd2e1b49425a9ad6e7ffab9c1c11fbc6b593 Mon Sep 17 00:00:00 2001
From: Blake Matthes <cowchmonkey@gmail.com>
Date: Thu, 24 Apr 2025 21:25:56 -0500
Subject: [PATCH] refactor(time): more time changes to fix 24 hour format

---
 frontend/src/utils/fixTime.ts                                | 2 +-
 frontend/src/utils/tableData/ppoo/ppooColumns.tsx            | 4 ++--
 .../src/utils/tableData/production/labels/labelColumns.tsx   | 5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/frontend/src/utils/fixTime.ts b/frontend/src/utils/fixTime.ts
index 5943859..d4bcaa9 100644
--- a/frontend/src/utils/fixTime.ts
+++ b/frontend/src/utils/fixTime.ts
@@ -16,6 +16,6 @@ export const fixTime = (date: any) => {
 
     return format(
         addHours(rawDate, offsetHours).toISOString(),
-        "MM/dd/yyyy hh:mm"
+        "MM/dd/yyyy HH:mm"
     );
 };
diff --git a/frontend/src/utils/tableData/ppoo/ppooColumns.tsx b/frontend/src/utils/tableData/ppoo/ppooColumns.tsx
index 528f069..0ea3691 100644
--- a/frontend/src/utils/tableData/ppoo/ppooColumns.tsx
+++ b/frontend/src/utils/tableData/ppoo/ppooColumns.tsx
@@ -1,5 +1,5 @@
 import { ColumnDef } from "@tanstack/react-table";
-import { format } from "date-fns";
+import { format } from "date-fns-tz";
 
 // This type is used to define the shape of our data.
 // You can use a Zod schema here if you want.
@@ -35,7 +35,7 @@ export const columns: ColumnDef<Adjustmnets>[] = [
             if (row.getValue("ProductionDate")) {
                 const correctDate = format(
                     row.getValue("ProductionDate"),
-                    "M/d/yyyy hh:mm"
+                    "M/d/yyyy HH:mm"
                 );
                 return (
                     <div className="text-left font-medium">{correctDate}</div>
diff --git a/frontend/src/utils/tableData/production/labels/labelColumns.tsx b/frontend/src/utils/tableData/production/labels/labelColumns.tsx
index 7e99feb..8a0003b 100644
--- a/frontend/src/utils/tableData/production/labels/labelColumns.tsx
+++ b/frontend/src/utils/tableData/production/labels/labelColumns.tsx
@@ -36,10 +36,7 @@ export const labelolumns: ColumnDef<Adjustmnets>[] = [
             if (row.getValue("upd_date")) {
                 const correctDate: any = row.getValue("upd_date");
                 const strippedDate = correctDate.replace("Z", ""); // Remove Z
-                const formattedDate = format(
-                    strippedDate,
-                    "MM/dd/yyyy hh:mm a"
-                );
+                const formattedDate = format(strippedDate, "MM/dd/yyyy HH:mm");
                 return (
                     <div className="text-left font-medium">{formattedDate}</div>
                 );