diff --git a/components/availability/AvailabilityForm.js b/components/availability/AvailabilityForm.js index 8c5936b..76dac5c 100644 --- a/components/availability/AvailabilityForm.js +++ b/components/availability/AvailabilityForm.js @@ -195,7 +195,7 @@ export default function AvailabilityForm({ publisherId, existingItems, inline, o availability.startTime = startTime; availability.endTime = endTime; - availability.name = common.getTimeFomatted(startTime) + "-" + common.getTimeFomatted(endTime); + availability.name = common.getTimeFormatted(startTime) + "-" + common.getTimeFormatted(endTime); availability.isWithTransportIn = group[0].isFirst && timeSlots[0].isWithTransport; availability.isWithTransportOut = group[group.length - 1].isLast && timeSlots[timeSlots.length - 1].isWithTransport; @@ -390,7 +390,7 @@ export default function AvailabilityForm({ publisherId, existingItems, inline, o {slots.map((slot, index) => { - const slotLabel = `${common.getTimeFomatted(slot.startTime)} до ${common.getTimeFomatted(slot.endTime)}`; + const slotLabel = `${common.getTimeFormatted(slot.startTime)} до ${common.getTimeFormatted(slot.endTime)}`; slot.transportNeeded = slot.isFirst || slot.isLast; // Determine if the current slot is the first or the last diff --git a/components/availability/AvailabilityFormDatePicker.js b/components/availability/AvailabilityFormDatePicker.js index 979975b..2a7d4ff 100644 --- a/components/availability/AvailabilityFormDatePicker.js +++ b/components/availability/AvailabilityFormDatePicker.js @@ -167,7 +167,7 @@ export default function AvailabilityForm({ publisherId, existingItem, inline, on if (!availability.name) { // availability.name = "От календара"; - availability.name = common.getTimeFomatted(availability.startTime) + "-" + common.getTimeFomatted(availability.endTime); + availability.name = common.getTimeFormatted(availability.startTime) + "-" + common.getTimeFormatted(availability.endTime); } availability.dayofweek = common.getDayOfWeekNameEnEnumForDate(availability.startTime); diff --git a/components/calendar/avcalendar.tsx b/components/calendar/avcalendar.tsx index 5350523..8aca614 100644 --- a/components/calendar/avcalendar.tsx +++ b/components/calendar/avcalendar.tsx @@ -353,15 +353,15 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => { bgColor = event.isBySystem ? "bg-red-500" : (event.isConfirmed || true ? "bg-green-500" : "bg-yellow-500"); //event.title = event.publisher.name; //ToDo: add other publishers names - //event.title = common.getTimeFomatted(event.startTime) + " - " + common.getTimeFomatted(event.endTime); + //event.title = common.getTimeFormatted(event.startTime) + " - " + common.getTimeFormatted(event.endTime); } else { if (event.start !== undefined && event.end !== undefined && event.startTime !== null && event.endTime !== null) { try { if (event.type === "recurring") { - event.title = common.getTimeFomatted(event.startTime) + " - " + common.getTimeFomatted(event.endTime); + event.title = common.getTimeFormatted(event.startTime) + " - " + common.getTimeFormatted(event.endTime); } else { - event.title = common.getTimeFomatted(event.startTime) + " - " + common.getTimeFomatted(event.endTime); + event.title = common.getTimeFormatted(event.startTime) + " - " + common.getTimeFormatted(event.endTime); } } catch (err) { diff --git a/pages/dash.tsx b/pages/dash.tsx index 8dee455..568b1d5 100644 --- a/pages/dash.tsx +++ b/pages/dash.tsx @@ -119,7 +119,7 @@ export default function IndexPage({ initialItems, initialUserId }: IProps) { // ...item, // startTime: item.startTime.toISOString(), // endTime: item.endTime.toISOString(), -// name: common.getTimeFomatted(item.startTime) + "-" + common.getTimeFomatted(item.endTime), +// name: common.getTimeFormatted(item.startTime) + "-" + common.getTimeFormatted(item.endTime), // //endDate can be null // endDate: item.endDate ? item.endDate.toISOString() : null, // type: 'availability', @@ -175,7 +175,7 @@ export default function IndexPage({ initialItems, initialUserId }: IProps) { // endTime: item.shift.endTime.toISOString(), // // name: item.shift.publishers.map(p => p.firstName + " " + p.lastName).join(", "), // //name: item.shift.assignments.map(a => a.publisher.firstName[0] + " " + a.publisher.lastName).join(", "), -// name: common.getTimeFomatted(new Date(item.shift.startTime)) + "-" + common.getTimeFomatted(new Date(item.shift.endTime)), +// name: common.getTimeFormatted(new Date(item.shift.startTime)) + "-" + common.getTimeFormatted(new Date(item.shift.endTime)), // type: 'assignment', // //delete shift object // shift: null, diff --git a/src/helpers/common.js b/src/helpers/common.js index ee06280..e5208a3 100644 --- a/src/helpers/common.js +++ b/src/helpers/common.js @@ -355,7 +355,7 @@ exports.getDateFormatedShort = function (date) { } -exports.getTimeFomatted = function (date) { +exports.getTimeFormatted = function (date) { return date.toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', timeZone: 'Europe/Sofia' });//timeZone: 'local' } diff --git a/src/helpers/data.js b/src/helpers/data.js index 79a5079..49a0004 100644 --- a/src/helpers/data.js +++ b/src/helpers/data.js @@ -158,7 +158,7 @@ async function getAvailabilities(userId) { ...item, startTime: item.startTime.toISOString(), endTime: item.endTime.toISOString(), - name: common.getTimeFomatted(item.startTime) + "-" + common.getTimeFomatted(item.endTime), + name: common.getTimeFormatted(item.startTime) + "-" + common.getTimeFormatted(item.endTime), //endDate can be null endDate: item.endDate ? item.endDate.toISOString() : null, type: 'availability', @@ -214,7 +214,7 @@ async function getAvailabilities(userId) { endTime: item.shift.endTime.toISOString(), // name: item.shift.publishers.map(p => p.firstName + " " + p.lastName).join(", "), //name: item.shift.assignments.map(a => a.publisher.firstName[0] + " " + a.publisher.lastName).join(", "), - name: common.getTimeFomatted(new Date(item.shift.startTime)) + "-" + common.getTimeFomatted(new Date(item.shift.endTime)), + name: common.getTimeFormatted(new Date(item.shift.startTime)) + "-" + common.getTimeFormatted(new Date(item.shift.endTime)), type: 'assignment', //delete shift object shift: null, @@ -666,7 +666,7 @@ async function getCalendarEvents(publisherId, date, availabilities = true, assig publisher.availabilities?.forEach(item => { result.push({ ...item, - title: common.getTimeFomatted(new Date(item.startTime)) + "-" + common.getTimeFomatted(new Date(item.endTime)), //item.name, + title: common.getTimeFormatted(new Date(item.startTime)) + "-" + common.getTimeFormatted(new Date(item.endTime)), //item.name, date: new Date(item.startTime), startTime: new Date(item.startTime), endTime: new Date(item.endTime), @@ -686,7 +686,7 @@ async function getCalendarEvents(publisherId, date, availabilities = true, assig ).forEach(item => { result.push({ ...item, - title: common.getTimeFomatted(new Date(item.shift.startTime)) + "-" + common.getTimeFomatted(new Date(item.shift.endTime)), + title: common.getTimeFormatted(new Date(item.shift.startTime)) + "-" + common.getTimeFormatted(new Date(item.shift.endTime)), date: new Date(item.shift.startTime), startTime: new Date(item.shift.startTime), endTime: new Date(item.shift.endTime),