ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2025-07-17 02:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Seconds & time logic

Browse Source
This commit is contained in:
Dejan
2024-10-12 20:44:29 +02:00
parent 621c7f1f50
commit ed0c654a55
2 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/pages/calendar/EditEventDialog.tsx
View File

@ -123,6 +123,7 @@ const EditEventDialog = (editEventProps: IEditEventDialog) => {
value={event.start} value={event.start}
text70 text70
marginL-8 marginL-8
maximumDate={event.end}
onChange={(date) => { onChange={(date) => {
setEvent((prev) => ({ ...prev, start: date })); setEvent((prev) => ({ ...prev, start: date }));
}} }}
@ -134,6 +135,11 @@ const EditEventDialog = (editEventProps: IEditEventDialog) => {
onChange={(date) => { onChange={(date) => {
setEvent((prev) => ({ ...prev, start: date })); setEvent((prev) => ({ ...prev, start: date }));
}} }}
maximumDate={event.end}
dateTimeFormatter={(date, mode) => date.toLocaleTimeString("en-us",
{ hour: "numeric",
minute: "numeric"
})}
mode="time" mode="time"
marginR-30 marginR-30
/> />
@ -145,6 +151,7 @@ const EditEventDialog = (editEventProps: IEditEventDialog) => {
<Feather name="calendar" size={25} color="#919191" /> <Feather name="calendar" size={25} color="#919191" />
<DateTimePicker <DateTimePicker
value={event.end} value={event.end}
minimumDate={event.start}
text70 text70
marginL-8 marginL-8
onChange={(date) => { onChange={(date) => {
@ -155,9 +162,14 @@ const EditEventDialog = (editEventProps: IEditEventDialog) => {
<DateTimePicker <DateTimePicker
text70 text70
value={event.end} value={event.end}
minimumDate={event.start}
onChange={(date) => { onChange={(date) => {
setEvent((prev) => ({ ...prev, end: date })); setEvent((prev) => ({ ...prev, end: date }));
}} }}
dateTimeFormatter={(date, mode) => date.toLocaleTimeString("en-us",
{ hour: "numeric",
minute: "numeric"
})}
mode="time" mode="time"
marginR-30 marginR-30
/> />

36
components/pages/calendar/ManuallyAddEventModal.tsx
View File

@ -69,7 +69,7 @@ export const ManuallyAddEventModal = ({
return date; return date;
}); });
const [endTime, setEndTime] = useState(() => { const [endTime, setEndTime] = useState(() => {
const date = initialDate ? addHours(initialDate, 1) : new Date(); const date = initialDate ? addHours(initialDate, 1) : addHours(new Date(), 1);
date.setSeconds(0, 0); date.setSeconds(0, 0);
return date; return date;
}); });
@ -243,14 +243,27 @@ export const ManuallyAddEventModal = ({
<Feather name="calendar" size={25} color="#919191" /> <Feather name="calendar" size={25} color="#919191" />
<DateTimePicker <DateTimePicker
value={startDate} value={startDate}
text70
marginL-8
onChange={(date) => { onChange={(date) => {
setStartDate(date); setStartDate(date);
}} }}
maximumDate={endDate}
text70
marginL-8
/> />
</View> </View>
<DateTimePicker text70 value={startDate} mode="time" marginR-30/> <DateTimePicker
value={startTime}
onChange={(date) => setStartTime(date)}
maximumDate={endTime}
minuteInterval={5}
dateTimeFormatter={(date, mode) => date.toLocaleTimeString("en-us",
{ hour: "numeric",
minute: "numeric"
})}
mode="time"
text70
marginR-30
/>
</View> </View>
{!isAllDay && <View row marginB-10 spread> {!isAllDay && <View row marginB-10 spread>
@ -258,6 +271,7 @@ export const ManuallyAddEventModal = ({
<Feather name="calendar" size={25} color="#919191" /> <Feather name="calendar" size={25} color="#919191" />
<DateTimePicker <DateTimePicker
value={endDate} value={endDate}
minimumDate={startDate}
text70 text70
marginL-8 marginL-8
onChange={(date) => { onChange={(date) => {
@ -265,7 +279,19 @@ export const ManuallyAddEventModal = ({
}} }}
/> />
</View> </View>
<DateTimePicker text70 value={endDate} mode="time" marginR-30/> <DateTimePicker
value={endTime}
onChange={(date) => setEndTime(date)}
minimumDate={startTime}
minuteInterval={5}
dateTimeFormatter={(date, mode) => date.toLocaleTimeString("en-us",
{ hour: "numeric",
minute: "numeric"
})}
mode="time"
text70
marginR-30
/>
</View>} </View>}
</View> </View>