From 35535b37798630a239f3c0800c22701ad3a40060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Gustavo?=
 <166467972+JoaoGustavo-dev@users.noreply.github.com>
Date: Thu, 30 Oct 2025 17:51:45 -0300
Subject: [PATCH] fix-timezone

---
 .../app/(main-routes)/calendar/page.tsx       |  1 +
 .../components/agendamento/AgendaCalendar.tsx | 31 ++++++++++++-------
 susconecta/components/ui/calendar.tsx         |  8 ++---
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/susconecta/app/(main-routes)/calendar/page.tsx b/susconecta/app/(main-routes)/calendar/page.tsx
index f1ce1b3..869ccc4 100644
--- a/susconecta/app/(main-routes)/calendar/page.tsx
+++ b/susconecta/app/(main-routes)/calendar/page.tsx
@@ -170,6 +170,7 @@ export default function AgendamentoPage() {
                 plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
                 initialView="dayGridMonth"
                 locale={pt_br_locale}
+                timeZone={"America/Sao_Paulo"}
                 events={requestsList}
                 headerToolbar={{
                   left: "prev,next today",
diff --git a/susconecta/components/agendamento/AgendaCalendar.tsx b/susconecta/components/agendamento/AgendaCalendar.tsx
index da0abe1..983e49d 100644
--- a/susconecta/components/agendamento/AgendaCalendar.tsx
+++ b/susconecta/components/agendamento/AgendaCalendar.tsx
@@ -66,7 +66,8 @@ export default function AgendaCalendar({
       weekday: 'long', 
       day: 'numeric', 
       month: 'long', 
-      year: 'numeric' 
+      year: 'numeric',
+      timeZone: 'America/Sao_Paulo'
     });
   };
 
@@ -205,18 +206,22 @@ export default function AgendaCalendar({
               
               <div className="flex-1">
                 <div className="h-12 border-b border-gray-200 flex items-center justify-center text-sm font-medium text-gray-500">
-                  {currentDate.toLocaleDateString('pt-BR', { weekday: 'long' })}
-                </div>
+                    {currentDate.toLocaleDateString('pt-BR', { weekday: 'long', timeZone: 'America/Sao_Paulo' })}
+                  </div>
                 <div className="relative">
                   {timeSlots.map(time => (
                     <div key={time} className="h-16 border-b border-gray-200"></div>
                   ))}
                   
                   {filteredAppointments.map(app => {
-                    const [date, timeStr] = app.time.split('T');
-                    const [hours, minutes] = timeStr.split(':');
-                    const hour = parseInt(hours);
-                    const minute = parseInt(minutes);
+                    // parse appointment time in Brazil timezone
+                    const d = new Date(app.time);
+                    // extract hour/minute in America/Sao_Paulo using Intl.DateTimeFormat
+                    const parts = new Intl.DateTimeFormat('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', timeZone: 'America/Sao_Paulo' }).formatToParts(d);
+                    const hourPart = parts.find(p => p.type === 'hour')?.value ?? '00';
+                    const minutePart = parts.find(p => p.type === 'minute')?.value ?? '00';
+                    const hour = parseInt(hourPart, 10);
+                    const minute = parseInt(minutePart, 10);
                     
                     return (
                       <div
@@ -236,7 +241,7 @@ export default function AgendaCalendar({
                             </div>
                             <div className="text-xs flex items-center mt-1">
                               <Clock className="h-3 w-3 mr-1" />
-                              {hours}:{minutes} - {app.type} {getTypeIcon(app.type)}
+                              {String(hour).padStart(2,'0')}:{String(minute).padStart(2,'0')} - {app.type} {getTypeIcon(app.type)}
                             </div>
                             <div className="text-xs mt-1">
                               {professionals.find(p => p.id === app.professional)?.name}
@@ -260,9 +265,13 @@ export default function AgendaCalendar({
       {view === 'month' && (
         <div className="p-4">
           <div className="space-y-4">
-            {filteredAppointments.map(app => {
-              const [date, timeStr] = app.time.split('T');
-              const [hours, minutes] = timeStr.split(':');
+              {filteredAppointments.map(app => {
+              const d = new Date(app.time);
+              const parts = new Intl.DateTimeFormat('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', timeZone: 'America/Sao_Paulo' }).formatToParts(d);
+              const hourPart = parts.find(p => p.type === 'hour')?.value ?? '00';
+              const minutePart = parts.find(p => p.type === 'minute')?.value ?? '00';
+              const hours = String(hourPart).padStart(2,'0');
+              const minutes = String(minutePart).padStart(2,'0');
               
               return (
                 <div key={app.id} className={`border-l-4 p-4 rounded-lg shadow-sm ${getStatusColor(app.status)}`}>
diff --git a/susconecta/components/ui/calendar.tsx b/susconecta/components/ui/calendar.tsx
index 4d7c46a..5479c11 100644
--- a/susconecta/components/ui/calendar.tsx
+++ b/susconecta/components/ui/calendar.tsx
@@ -35,9 +35,9 @@ function Calendar({
         className
       )}
       captionLayout={captionLayout}
-      formatters={{
+        formatters={{
         formatMonthDropdown: (date) =>
-          date.toLocaleString("default", { month: "short" }),
+          date.toLocaleString("default", { month: "short", timeZone: 'America/Sao_Paulo' }),
         ...formatters,
       }}
       classNames={{
@@ -155,7 +155,7 @@ function Calendar({
             <ChevronDownIcon className={cn("size-4", className)} {...props} />
           )
         },
-        DayButton: CalendarDayButton,
+  DayButton: CalendarDayButton,
         WeekNumber: ({ children, ...props }) => {
           return (
             <td {...props}>
@@ -190,7 +190,7 @@ function CalendarDayButton({
       ref={ref}
       variant="ghost"
       size="icon"
-      data-day={day.date.toLocaleDateString()}
+  data-day={day.date.toLocaleDateString(undefined, { timeZone: 'America/Sao_Paulo' })}
       data-selected-single={
         modifiers.selected &&
         !modifiers.range_start &&