Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion web/src/components/EventDetailsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -670,9 +670,14 @@ export default function EventDetailsModal({ event, onClose }: EventDetailsModalP
onChange={(e) => {
// Convertir la valeur datetime-local en ISO 8601 avec timezone
const isoDate = e.target.value ? new Date(e.target.value).toISOString() : ''
const currentEndDate = editedEvent.attributes.endDate
// If endDate is before the new startDate, adjust endDate to match startDate
const updatedEndDate = (currentEndDate && isoDate && new Date(isoDate) > new Date(currentEndDate))
? isoDate
: currentEndDate
setEditedEvent({
...editedEvent,
attributes: { ...editedEvent.attributes, startDate: isoDate }
attributes: { ...editedEvent.attributes, startDate: isoDate, endDate: updatedEndDate }
})
}}
/>
Expand All @@ -692,6 +697,7 @@ export default function EventDetailsModal({ event, onClose }: EventDetailsModalP
type="datetime-local"
className="input text-sm"
value={editedEvent.attributes.endDate ? new Date(editedEvent.attributes.endDate).toISOString().slice(0, 16) : ''}
min={editedEvent.attributes.startDate ? new Date(editedEvent.attributes.startDate).toISOString().slice(0, 16) : undefined}
onChange={(e) => {
// Convertir la valeur datetime-local en ISO 8601 avec timezone
const isoDate = e.target.value ? new Date(e.target.value).toISOString() : ''
Expand Down
17 changes: 13 additions & 4 deletions web/src/pages/CreateEvent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,18 @@ export default function CreateEvent() {
id="startDate"
type="datetime-local"
value={formData.attributes.startDate || ''}
onChange={(e) => setFormData({
...formData,
attributes: { ...formData.attributes, startDate: e.target.value }
})}
onChange={(e) => {
const newStartDate = e.target.value
const currentEndDate = formData.attributes.endDate
// If endDate is before the new startDate, adjust endDate to match startDate
const updatedEndDate = (currentEndDate && newStartDate && newStartDate > currentEndDate)
? newStartDate
: currentEndDate
setFormData({
...formData,
attributes: { ...formData.attributes, startDate: newStartDate, endDate: updatedEndDate }
})
}}
/>
</div>

Expand All @@ -387,6 +395,7 @@ export default function CreateEvent() {
id="endDate"
type="datetime-local"
value={formData.attributes.endDate || ''}
min={formData.attributes.startDate || undefined}
onChange={(e) => setFormData({
...formData,
attributes: { ...formData.attributes, endDate: e.target.value }
Expand Down
Loading