{item.dayOfMonth ? `${common.getDateFormated(new Date(item.startTime))}` : `Всеки(Всяка) ${common.getDayOfWeekName(new Date(item.startTime))}`}
{/* {common.getDateFormated(new Date(item.startTime))} */}
diff --git a/components/calendar/ShiftComponent.tsx b/components/calendar/ShiftComponent.tsx
index f78f498..a50db70 100644
--- a/components/calendar/ShiftComponent.tsx
+++ b/components/calendar/ShiftComponent.tsx
@@ -1,49 +1,13 @@
import React, { useState, useEffect } from 'react';
import axiosInstance from '../../src/axiosSecure';
import PublisherSearchBox from '../publisher/PublisherSearchBox'; // Update the path
+import Modal from '../Modal';
+
+import LocalShippingIcon from '@mui/icons-material/LocalShipping';
const common = require('src/helpers/common');
-interface ModalProps {
- children: React.ReactNode;
- isOpen: boolean;
- onClose: () => void;
- forDate: Date;
- useFilterDate: boolean;
- onUseFilterDateChange: (value: boolean) => void;
-}
-
-function Modal({ children, isOpen, onClose, forDate, useFilterDate, onUseFilterDateChange }: ModalProps) {
- if (!isOpen) return null;
- const isValidDate = forDate instanceof Date && !isNaN(forDate.getTime());
- console.log("forDate", forDate, isValidDate);
-
- return (
-
-
- {isValidDate && (
-
-
-
- )}
- {children}
-
-
-
-
{`${common.getTimeRange(new Date(shift.startTime), new Date(shift.endTime))}`}
+ {/* {shift.requiresTransport && ()} */}
{/* Copy All Names Button */}
@@ -149,13 +122,13 @@ function ShiftComponent({ shift, onShiftSelect, isSelected, onPublisherSelect, a
)}
-
{/* Assignments */}
{assignments.map((ass, index) => {
const publisherInfo = allPublishersInfo.find(info => info?.id === ass.publisher.id) || ass.publisher;
// Determine border styles
let borderStyles = '';
+ let canTransport = false;
if (selectedPublisher && selectedPublisher.id === ass.publisher.id) {
borderStyles += 'border-2 border-blue-300'; // Bottom border for selected publishers
}
@@ -172,10 +145,12 @@ function ShiftComponent({ shift, onShiftSelect, isSelected, onPublisherSelect, a
else {
// checkig if the publisher is available for this assignment
- if (publisherInfo.availabilities?.some(av =>
- av.startTime <= shift.startTime &&
- av.endTime >= shift.endTime)) {
+ const av = publisherInfo.availabilities?.find(av =>
+ av.startTime <= shift.startTime && av.endTime >= shift.endTime
+ );
+ if (av) {
borderStyles += 'border-l-2 border-blue-500 '; // Left border for specific availability conditions
+ ass.canTransport = av.isWithTransportIn || av.isWithTransportOut;
}
if (publisherInfo.hasUpToDateAvailabilities) {
@@ -194,17 +169,29 @@ function ShiftComponent({ shift, onShiftSelect, isSelected, onPublisherSelect, a
}
}
+
return (
handlePublisherClick(ass.publisher)}>
{publisherInfo.firstName} {publisherInfo.lastName}
-
+
+ {/* //if shift.isWithTransport, add trnsport button toggle, which sets ass.isWithTransportIn */}
+ {shift.requiresTransport && (
+ toggleTransport(ass) : undefined}
+ className={`material-icons ${ass.isWithTransport ? 'text-green-500 font-bold' : (transportProvided ? 'text-gray-400 ' : 'text-orange-400 font-bold')} ${ass.canTransport ? ' cursor-pointer' : 'cursor-not-allowed'} px-3 py-1 ml-2 rounded-md`}
+ >
+ {ass.isWithTransport ? "транспорт" : ass.canTransport ? "може транспорт" : "без транспорт"}
+
+ )}
+
+
+
+
);
@@ -243,7 +230,7 @@ function ShiftComponent({ shift, onShiftSelect, isSelected, onPublisherSelect, a
showList={false}
/>
-
+
);
}
diff --git a/components/calendar/avcalendar.tsx b/components/calendar/avcalendar.tsx
index c868f82..a83d257 100644
--- a/components/calendar/avcalendar.tsx
+++ b/components/calendar/avcalendar.tsx
@@ -56,7 +56,14 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
// Update internal state when `events` prop changes
useEffect(() => {
- const updatedEvents = events.map(event => ({
+ //if we have isBySystem - set type to assignment
+ let updatedEvents = events?.map(event => {
+ if (event.isBySystem) {
+ event.type = "assignment";
+ }
+ return event;
+ });
+ updatedEvents = events?.map(event => ({
...event,
date: new Date(event.startTime).setHours(0, 0, 0, 0),
startTime: new Date(event.startTime),
@@ -206,7 +213,7 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
// startTime: start,
// endTime: end,
// dayOfMonth: start.getDate(),
- // isactive: true,
+ // isActive: true,
// publisherId: publisherId,
// // Add any other initial values needed
// //set dayOfMonth to null, so that we repeat the availability every week
@@ -273,9 +280,14 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
//if event.type is availability show in blue. if it is schedule - green if confirmed, yellow if not confirmed
//if event is not active - show in gray
let bgColorClass = 'bg-gray-500'; // Default color for inactive events
- var bgColor = event.isactive ? "" : "bg-gray-500";
+ var bgColor = event.isActive ? "" : "bg-gray-500";
+ //ToDo: fix this. maybe we're missing some properties
+ // if (event.isFromPreviousMonth) {
+ // // set opacity to 0.5
+ // bgColor = "bg-orange-500";
+ // }
if (event.type === "assignment") {
- bgColor = event.isTentative ? "bg-red-500" : (event.isConfirmed ? "bg-green-500" : "bg-yellow-500");
+ bgColor = event.isBySystem ? "bg-red-500" : (event.isConfirmed ? "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);
@@ -297,11 +309,14 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
}
}
+
eventStyle = {
...style,
// backgroundColor: bgColorClass,
//height: "50px",
//color: 'white',
+ //if (event.isFromPreviousAssignment) { set opacity to 0.5 }
+ // opacity: event.isFromPreviousMonth ? 0.5 : 1,
whiteSpace: 'normal', // Allow the text to wrap to the next line
overflow: 'hidden', // Hide overflowed content
textOverflow: 'ellipsis' // Add ellipsis to text that's too long to fit
@@ -319,7 +334,7 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
toast.info("Потвърдено!", { autoClose: 2000 });
// Update the event data
event.isConfirmed = true;
- event.isTentative = false;
+ event.isBySystem = false;
// Update the events array by first removing the old event and then adding the updated one
setEvents(currentEvents => {
const filteredEvents = currentEvents.filter(e => e.id !== event.id);
@@ -328,7 +343,7 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
//store the updated event in the database
var assignment = {
isConfirmed: true,
- isTentative: false
+ isBySystem: false
};
axiosInstance.put('/api/data/assignments/' + event.id, assignment)
.then((response) => {
@@ -356,7 +371,7 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
*/}
{/* Confirm Icon */}
- {!event.isConfirmed && (
+ {/* {!event.isConfirmed && (
{
>
✓
- )}
+ )} */}
)}
@@ -388,7 +403,7 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
// orange-500 from Tailwind CSS
backgroundColor = '#f56565';
}
- if (event.isactive) {
+ if (event.isActive) {
switch (event.type) {
case 'assignment':
backgroundColor = event.isConfirmed ? '#48bb78' : '#f6e05e'; // green-500 and yellow-300 from Tailwind CSS
diff --git a/components/cartevent/CartEventForm.tsx b/components/cartevent/CartEventForm.tsx
index 1399799..d6d6fdd 100644
--- a/components/cartevent/CartEventForm.tsx
+++ b/components/cartevent/CartEventForm.tsx
@@ -15,7 +15,7 @@ model CartEvent {
shiftDuration Int
shifts Shift[]
dayofweek DayOfWeek
- isactive Boolean @default(true)
+ isActive Boolean @default(true)
}*/
interface Location {
id: number;
@@ -174,8 +174,8 @@ export default function CartEventForm(props: IProps) {
diff --git a/components/location/LocationCard.js b/components/location/LocationCard.js
index 2a2a3ec..adaf15c 100644
--- a/components/location/LocationCard.js
+++ b/components/location/LocationCard.js
@@ -28,11 +28,11 @@ export default function LocationCard({ location }) {
<>
router.push(`/cart/locations/edit/${location.id}`)}
>
- {location.name} ({location.isactive ? "active" : "inactive"})
+ {location.name} ({location.isActive ? "active" : "inactive"})
{location.address}
diff --git a/components/location/LocationForm.js b/components/location/LocationForm.js
index 098186a..4f58fdb 100644
--- a/components/location/LocationForm.js
+++ b/components/location/LocationForm.js
@@ -19,7 +19,7 @@ const common = require('src/helpers/common');
// id Int @id @default(autoincrement())
// name String
// address String
-// isactive Boolean @default(true)
+// isActive Boolean @default(true)
// content String? @db.Text
// cartEvents CartEvent[]
// reports Report[]
@@ -65,7 +65,7 @@ export default function LocationForm() {
const [location, set] = useState({
name: "",
address: "",
- isactive: true,
+ isActive: true,
});
// const [isEdit, setIsEdit] = useState(false);
@@ -171,11 +171,11 @@ export default function LocationForm() {
- {/* UI for Location.isactive */}
+ {/* UI for Location.isActive */}
{/* backupLocation */}
diff --git a/components/publisher/PublisherCard.js b/components/publisher/PublisherCard.js
index a993240..248f067 100644
--- a/components/publisher/PublisherCard.js
+++ b/components/publisher/PublisherCard.js
@@ -57,7 +57,7 @@ export default function PublisherCard({ publisher }) {
return isCardVisible ? (
// className="block p-6 max-w-sm bg-white rounded-lg border border-gray-200 shadow-md hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700 mb-3"
- {publisher.firstName} {publisher.lastName} ({publisher.isactive ? "active" : "inactive"})
+ {publisher.firstName} {publisher.lastName} ({publisher.isActive ? "active" : "inactive"})
{publisher.assignments.length} смени общо
diff --git a/components/publisher/PublisherForm.js b/components/publisher/PublisherForm.js
index f5f1f44..99bde59 100644
--- a/components/publisher/PublisherForm.js
+++ b/components/publisher/PublisherForm.js
@@ -23,7 +23,7 @@ import { UserRole } from "@prisma/client";
// lastName String
// email String @unique
// phone String?
-// isactive Boolean @default(true)
+// isActive Boolean @default(true)
// isImported Boolean @default(false)
// age Int?
// availabilities Availability[]
@@ -75,7 +75,7 @@ export default function PublisherForm({ item, me }) {
}, []);
const [publisher, set] = useState(item || {
- isactive: true,
+ isActive: true,
});
const handleChange = ({ target }) => {
@@ -185,10 +185,13 @@ export default function PublisherForm({ item, me }) {
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {/* ADMINISTRATORS ONLY */}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ Телеграм
+
-
-
-
-
-
- Телеграм
-
{/* ---------------------------- Actions --------------------------------- */}
@@ -312,7 +323,7 @@ export default function PublisherForm({ item, me }) {
-
+
|
- {item.id} {item.isactive}
+ {item.id} {item.isActive}
|
{item.publisher.lastName}, {item.publisher.firstName}
@@ -133,19 +133,19 @@ export const getServerSideProps = async (context) => {
const role = session?.user.role;
console.log("server role: " + role);
- var queryUrl = process.env.NEXTAUTH_URL + "/api/data/availabilities?select=id,name,isactive,dayofweek,dayOfMonth,startTime,endTime,publisher.firstName,publisher.lastName,publisher.id";
+ var queryUrl = process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/availabilities?select=id,name,isActive,dayofweek,dayOfMonth,startTime,endTime,publisher.firstName,publisher.lastName,publisher.id";
if (role === UserRole.USER || context.query.my) {
queryUrl += `&where={"publisherId":"${session?.user.id}"}`;
} else if (role == UserRole.ADMIN) {
if (context.query.id) {
queryUrl += `&where={"publisherId":"${context.query.id}"}`;
} else {
- queryUrl += `&where={"isactive":true}`;
+ queryUrl += `&where={"isActive":true}`;
}
}
var resp = await axios.get(
queryUrl
- // process.env.NEXTAUTH_URL + "/api/data/availabilities?include=publisher",
+ // process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/availabilities?include=publisher",
, { decompress: true });
var items = resp.data;
console.log("got " + items.length + " availabilities");
diff --git a/pages/cart/availabilities/new.tsx b/pages/cart/availabilities/new.tsx
index f281459..06a91b7 100644
--- a/pages/cart/availabilities/new.tsx
+++ b/pages/cart/availabilities/new.tsx
@@ -31,7 +31,7 @@ export const getServerSideProps = async (context) => {
};
}
const { data: item } = await axios.get(
- process.env.NEXTAUTH_URL + "/api/data/availabilities/" + context.params.id
+ process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/availabilities/" + context.params.id
);
return {
diff --git a/pages/cart/calendar/index.tsx b/pages/cart/calendar/index.tsx
index 244128c..5bb9269 100644
--- a/pages/cart/calendar/index.tsx
+++ b/pages/cart/calendar/index.tsx
@@ -14,6 +14,7 @@ const common = require('src/helpers/common');
import { toast } from 'react-toastify';
import ProtectedRoute from '../../../components/protectedRoute';
import ConfirmationModal from '../../../components/ConfirmationModal';
+import LocalShippingIcon from '@mui/icons-material/LocalShipping';
// import { FaPlus, FaCogs, FaTrashAlt, FaSpinner } from 'react-icons/fa'; // Import FontAwesome icons
@@ -56,6 +57,7 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
const [allShifts, setAllShifts] = useState(initialShifts);
+ const [isPublished, setIsPublished] = useState(() => initialShifts.some(shift => shift.isPublished));
const [value, onChange] = useState(new Date());
const [shifts, setShifts] = React.useState([]);
const [error, setError] = React.useState(null);
@@ -99,7 +101,7 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
console.log("Setting date to '" + date.toLocaleDateString() + "' from '" + selectedDate.toLocaleDateString() + "'. ISO: " + date.toISOString(), "locale ISO:", common.getISODateOnly(date));
if (isCheckboxChecked) {
console.log(`getting unassigned publishers for ${common.getMonthName(date.getMonth())} ${date.getFullYear()}`);
- const { data: availablePubsForDate } = await axiosInstance.get(`/api/?action=getUnassignedPublishers&date=${dateStr}&select=id,firstName,lastName,isactive,desiredShiftsPerMonth`);
+ const { data: availablePubsForDate } = await axiosInstance.get(`/api/?action=getUnassignedPublishers&date=${dateStr}&select=id,firstName,lastName,isActive,desiredShiftsPerMonth`);
setAvailablePubs(availablePubsForDate);
}
else {
@@ -107,7 +109,14 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
try {
const { data: shiftsForDate } = await axiosInstance.get(`/api/?action=getShiftsForDay&date=${dateStr}`);
setShifts(shiftsForDate);
- let { data: availablePubsForDate } = await axiosInstance.get(`/api/?action=filterPublishers&assignments=true&availabilities=true&date=${dateStr}&select=id,firstName,lastName,isactive,desiredShiftsPerMonth`);
+ setIsPublished(shiftsForDate.some(shift => shift.isPublished));
+ let { data: availablePubsForDate } = await axiosInstance.get(`/api/?action=filterPublishers&assignments=true&availabilities=true&date=${dateStr}&select=id,firstName,lastName,isActive,desiredShiftsPerMonth`);
+
+ availablePubsForDate.forEach(pub => {
+ pub.canTransport = pub.availabilities.some(av =>
+ av.isWithTransportIn || av.isWithTransportOut
+ );
+ });
//remove availabilities that are isFromPreviousAssignment or from previous month for each publisher
// availablePubsForDate = availablePubsForDate.map(pub => {
// pub.availabilities = pub.availabilities.filter(avail => avail.isFromPreviousAssignment == false);
@@ -134,30 +143,39 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
const handleShiftSelection = (selectedShift) => {
setSelectedShiftId(selectedShift.id);
const updatedPubs = availablePubs.map(pub => {
- const isAvailableForShift = pub.availabilities.some(avail =>
+ const av = pub.availabilities?.find(avail =>
avail.startTime <= selectedShift.startTime
&& avail.endTime >= selectedShift.endTime
- && avail.isFromPreviousAssignment == false
);
+ if (av) {
+ pub.isAvailableForShift = true;
+ pub.canTransport = av.isWithTransportIn || av.isWithTransportOut;
+ }
+
+ // const isAvailableForShift = pub.availabilities.some(avail =>
+ // avail.startTime <= selectedShift.startTime
+ // && avail.endTime >= selectedShift.endTime
+ // && avail.isFromPreviousAssignment == false
+ // );
const isAvailableForShiftWithPrevious = pub.availabilities.some(avail =>
avail.startTime <= selectedShift.startTime
&& avail.endTime >= selectedShift.endTime
);
- //! console.log(`Publisher ${pub.firstName} ${pub.lastName} is available for shift ${selectedShift.id}: ${isAvailableForShift}`);
- //// console.log(`Publisher ${pub.firstName} ${pub.lastName} has ${pub.availabilities.length} availabilities :` + pub.availabilities.map(avail => avail.startTime + " - " + avail.endTime));
- //// console.log(`Publisher ${pub.firstName} ${pub.lastName} has ${pub.availabilities.length} availabilities :` + stringify.join(', 'pub.availabilities.map(avail => avail.id)));
+ // //! console.log(`Publisher ${pub.firstName} ${pub.lastName} is available for shift ${selectedShift.id}: ${isAvailableForShift}`);
+ // //// console.log(`Publisher ${pub.firstName} ${pub.lastName} has ${pub.availabilities.length} availabilities :` + pub.availabilities.map(avail => avail.startTime + " - " + avail.endTime));
+ // //// console.log(`Publisher ${pub.firstName} ${pub.lastName} has ${pub.availabilities.length} availabilities :` + stringify.join(', 'pub.availabilities.map(avail => avail.id)));
- const availabilitiesIds = pub.availabilities.map(avail => avail.id).join(', ');
- //! console.log(`Publisher ${pub.firstName} ${pub.lastName} has ${pub.availabilities.length} availabilities with IDs: ${availabilitiesIds}`);
- return { ...pub, isAvailableForShift, isAvailableForShiftWithPrevious, isSelected: pub.id === selectedShift.selectedPublisher?.id };
+ // const availabilitiesIds = pub.availabilities.map(avail => avail.id).join(', ');
+ // //! console.log(`Publisher ${pub.firstName} ${pub.lastName} has ${pub.availabilities.length} availabilities with IDs: ${availabilitiesIds}`);
+ return { ...pub, isAvailableForShiftWithPrevious, isSelected: pub.id === selectedShift.selectedPublisher?.id };
});
// Sort publishers based on their availability state. use currentDayAssignments, currentWeekAssignments,
// currentMonthAssignments and previousMonthAssignments properties
// Sort publishers based on availability and then by assignment counts.
const sortedPubs = updatedPubs.sort((a, b) => {
- if (a.isactive !== b.isactive) {
- return a.isactive ? -1 : 1;
+ if (a.isActive !== b.isActive) {
+ return a.isActive ? -1 : 1;
}
// First, sort by isselected.
if (a.isSelected !== b.isSelected) {
@@ -339,7 +357,7 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
const newAssignment = {
publisher: { connect: { id: publisher.id } },
shift: { connect: { id: shiftId } },
- isactive: true,
+ isActive: true,
isConfirmed: true
};
const { data } = await axiosInstance.post("/api/data/assignments", newAssignment);
@@ -495,10 +513,26 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
}
}
+ const togglePublished = async () => {
+ try {
+ const publishState = !isPublished; // Toggle the state
+ const isPublishedParam = publishState ? 'true' : 'fasle';
+ await axiosInstance.get(`/api/?action=updateShifts&isPublished=${isPublishedParam}&date=${common.getISODateOnly(value)}`);
+ setIsPublished(publishState); // Update state based on the action
+
+ } catch (error) {
+ console.log(error);
+ }
+ }
+
const [isMenuOpen, setIsMenuOpen] = useState(false);
const [isConfirmModalOpen, setConfirmModalOpen] = useState(false);
+ async function copyOldAvailabilities(event: MouseEvent): Promise {
+ await axiosInstance.get(`/api/?action=copyOldAvailabilities&date=${common.getISODateOnly(value)}`);
+ }
+
return (
<>
@@ -534,6 +568,12 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
}}
message="Това ще изпрати имейли до всички участници за смените им през избрания месец. Сигурни ли сте?"
/>
+
+
)}
@@ -653,7 +694,7 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
// Determine border class if selected
const selectedBorderClass = pub.isSelected ? 'border-blue-400 border-b-4' : '';
// Determine opacity class
- const activeOpacityClass = pub.isactive ? '' : 'opacity-25';
+ const activeOpacityClass = pub.isActive ? '' : 'opacity-25';
return (
@@ -664,6 +705,7 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
>
{pub.firstName} {pub.lastName}
+ {pub.canTransport && ()}
@@ -849,9 +891,9 @@ import axiosServer from '../../../src/axiosServer';
import { start } from 'repl';
export const getServerSideProps = async (context) => {
const axios = await axiosServer(context);
- const baseUrl = common.getBaseUrl();
- console.log('runtime BaseUrl: ' + baseUrl);
- console.log('runtime NEXTAUTH_URL: ' + process.env.NEXTAUTH_URL);
+ // const baseUrl = common.getBaseUrl();
+ // console.log('runtime BaseUrl: ' + baseUrl);
+ console.log('runtime NEXT_PUBLIC_PUBLIC_URL: ' + process.env.NEXT_PUBLIC_PUBLIC_URL);
console.log('Runtime Axios Base URL:', axios.defaults.baseURL);
const currentDate = new Date();
@@ -861,20 +903,20 @@ export const getServerSideProps = async (context) => {
const url = `/api/data/shifts?where={"startTime":{"$and":[{"$gte":"${common.getISODateOnly(firstDayOfMonth)}","$lt":"${common.getISODateOnly(lastDayOfMonth)}"}]}}`;
const prismaClient = common.getPrismaClient();
- // let events = await prismaClient.cartEvent.findMany({ where: { isactive: true } });
+ // let events = await prismaClient.cartEvent.findMany({ where: { isActive: true } });
// events = events.map(event => ({
// ...event,
// // Convert Date objects to ISO strings
// startTime: event.startTime.toISOString(),
// endTime: event.endTime.toISOString(),
// }));
- const { data: events } = await axios.get(`/api/data/cartevents?where={"isactive":true}`);
+ const { data: events } = await axios.get(`/api/data/cartevents?where={"isActive":true}`);
//const { data: shifts } = await axios.get(url);
// get all shifts for the month, including assigments
let shifts = await prismaClient.shift.findMany({
where: {
- isactive: true,
+ isActive: true,
startTime: {
gte: firstDayOfMonth,
//lt: lastDayOfMonth
diff --git a/pages/cart/cartevents/edit/[id].tsx b/pages/cart/cartevents/edit/[id].tsx
index 81fca35..689c487 100644
--- a/pages/cart/cartevents/edit/[id].tsx
+++ b/pages/cart/cartevents/edit/[id].tsx
@@ -7,9 +7,9 @@ export const getServerSideProps = async (context) => {
console.log("edit page getServerSideProps");
const axios = await axiosServer(context);
const { id } = context.query;
- const { data } = await axios.get(`${process.env.NEXTAUTH_URL}/api/data/cartevents/` + id);
+ const { data } = await axios.get(`${process.env.NEXT_PUBLIC_PUBLIC_URL}/api/data/cartevents/` + id);
const locations = await axios
- .get(`${process.env.NEXTAUTH_URL}/api/data/locations?select=id,name`)
+ .get(`${process.env.NEXT_PUBLIC_PUBLIC_URL}/api/data/locations?select=id,name`)
.then((res) => {
console.log("locations: " + JSON.stringify(res.data));
return res.data;
diff --git a/pages/cart/cartevents/index.tsx b/pages/cart/cartevents/index.tsx
index c5006c1..0396d9f 100644
--- a/pages/cart/cartevents/index.tsx
+++ b/pages/cart/cartevents/index.tsx
@@ -69,7 +69,7 @@ export default function CartEventPage({ items, locations }: ICartEventPageProps)
{item.shiftDuration}
|
- {item.isactive ? "Yes" : "No"}
+ {item.isActive ? "Yes" : "No"}
|
| |