RiseUP/riseup-squad20
1
0
Fork 3
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop #83

Merged
M-Gabrielly merged 426 commits from develop into main 2025-12-04 04:13:15 +00:00
Conversation 0 Commits 426 Files Changed 170 +25 -15
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 35535b3779 - Show all commits

1
susconecta/app/(main-routes)/calendar/page.tsx
View File

@ -170,6 +170,7 @@ export default function AgendamentoPage() {
plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]} plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
initialView="dayGridMonth" initialView="dayGridMonth"
locale={pt_br_locale} locale={pt_br_locale}
timeZone={"America/Sao_Paulo"}
events={requestsList} events={requestsList}
headerToolbar={{ headerToolbar={{
left: "prev,next today", left: "prev,next today",

31
susconecta/components/agendamento/AgendaCalendar.tsx
View File

@ -66,7 +66,8 @@ export default function AgendaCalendar({
weekday: 'long', weekday: 'long',
day: 'numeric', day: 'numeric',
month: 'long', month: 'long',
year: 'numeric' year: 'numeric',
timeZone: 'America/Sao_Paulo'
}); });
}; };
@ -205,18 +206,22 @@ export default function AgendaCalendar({
<div className="flex-1"> <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"> <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' })} {currentDate.toLocaleDateString('pt-BR', { weekday: 'long', timeZone: 'America/Sao_Paulo' })}
</div> </div>
<div className="relative"> <div className="relative">
{timeSlots.map(time => ( {timeSlots.map(time => (
<div key={time} className="h-16 border-b border-gray-200"></div> <div key={time} className="h-16 border-b border-gray-200"></div>
))} ))}
{filteredAppointments.map(app => { {filteredAppointments.map(app => {
const [date, timeStr] = app.time.split('T'); // parse appointment time in Brazil timezone
const [hours, minutes] = timeStr.split(':'); const d = new Date(app.time);
const hour = parseInt(hours); // extract hour/minute in America/Sao_Paulo using Intl.DateTimeFormat
const minute = parseInt(minutes); 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 ( return (
<div <div
@ -236,7 +241,7 @@ export default function AgendaCalendar({
</div> </div>
<div className="text-xs flex items-center mt-1"> <div className="text-xs flex items-center mt-1">
<Clock className="h-3 w-3 mr-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>
<div className="text-xs mt-1"> <div className="text-xs mt-1">
{professionals.find(p => p.id === app.professional)?.name} {professionals.find(p => p.id === app.professional)?.name}
@ -260,9 +265,13 @@ export default function AgendaCalendar({
{view === 'month' && ( {view === 'month' && (
<div className="p-4"> <div className="p-4">
<div className="space-y-4"> <div className="space-y-4">
{filteredAppointments.map(app => { {filteredAppointments.map(app => {
const [date, timeStr] = app.time.split('T'); const d = new Date(app.time);
const [hours, minutes] = timeStr.split(':'); 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 ( return (
<div key={app.id} className={`border-l-4 p-4 rounded-lg shadow-sm ${getStatusColor(app.status)}`}> <div key={app.id} className={`border-l-4 p-4 rounded-lg shadow-sm ${getStatusColor(app.status)}`}>

8
susconecta/components/ui/calendar.tsx
View File

@ -35,9 +35,9 @@ function Calendar({
className className
)} )}
captionLayout={captionLayout} captionLayout={captionLayout}
formatters={{ formatters={{
formatMonthDropdown: (date) => formatMonthDropdown: (date) =>
date.toLocaleString("default", { month: "short" }), date.toLocaleString("default", { month: "short", timeZone: 'America/Sao_Paulo' }),
...formatters, ...formatters,
}} }}
classNames={{ classNames={{
@ -155,7 +155,7 @@ function Calendar({
<ChevronDownIcon className={cn("size-4", className)} {...props} /> <ChevronDownIcon className={cn("size-4", className)} {...props} />
) )
}, },
DayButton: CalendarDayButton, DayButton: CalendarDayButton,
WeekNumber: ({ children, ...props }) => { WeekNumber: ({ children, ...props }) => {
return ( return (
<td {...props}> <td {...props}>
@ -190,7 +190,7 @@ function CalendarDayButton({
ref={ref} ref={ref}
variant="ghost" variant="ghost"
size="icon" size="icon"
data-day={day.date.toLocaleDateString()} data-day={day.date.toLocaleDateString(undefined, { timeZone: 'America/Sao_Paulo' })}
data-selected-single={ data-selected-single={
modifiers.selected && modifiers.selected &&
!modifiers.range_start && !modifiers.range_start &&