diff --git a/components/availability/AvailabilityList.js b/components/availability/AvailabilityList.js index cb9cc56..99bd3b0 100644 --- a/components/availability/AvailabilityList.js +++ b/components/availability/AvailabilityList.js @@ -9,6 +9,7 @@ const common = require('src/helpers/common'); import AvailabilityForm from "../availability/AvailabilityForm"; import { TrashIcon, PencilSquareIcon } from "@heroicons/react/24/outline"; +import { Availability, AvailabilityType } from "@prisma/client"; @@ -58,7 +59,10 @@ export default function AvailabilityList({ publisher, showNew }) { {items?.sort((a, b) => new Date(a.startTime) - new Date(b.startTime)).map(item => ( - {item.dayOfMonth ? `${common.getDateFormated(new Date(item.startTime))}` : `Всеки(Всяка) ${common.getDayOfWeekName(new Date(item.startTime))}`} + {item.type == AvailabilityType.OneTime ? `${common.getDateFormated(new Date(item.startTime))}` : + item.type == AvailabilityType.Weekly ? `Всеки(Всяка) ${common.getDayOfWeekName(new Date(item.startTime))}` : "месечно" + + } {/* {common.getDateFormated(new Date(item.startTime))} */} @@ -118,14 +122,14 @@ export default function AvailabilityList({ publisher, showNew }) { } -export const getServerSideProps = async () => { - const { data: items } = await axiosInstance.get( - common.getBaseUrl("/api/data/availabilities") - ); +// export const getServerSideProps = async () => { +// const { data: items } = await axiosInstance.get( +// common.getBaseUrl("/api/data/availabilities") +// ); - return { - props: { - items, - }, - }; -}; \ No newline at end of file +// return { +// props: { +// items, +// }, +// }; +// }; \ No newline at end of file diff --git a/pages/cart/publishers/edit/[id].tsx b/pages/cart/publishers/edit/[id].tsx index 0e93b9a..aca5b00 100644 --- a/pages/cart/publishers/edit/[id].tsx +++ b/pages/cart/publishers/edit/[id].tsx @@ -2,7 +2,7 @@ import axiosServer from '../../../../src/axiosServer'; import NewPubPage from "../new"; export default NewPubPage; -import { Assignment, Shift, UserRole } from "prisma/prisma-client"; +import { Assignment, Shift, UserRole, AvailabilityType } from "prisma/prisma-client"; // import { monthNamesBG } from "~/src/helpers/const" import { monthNamesBG } from "src/helpers/const"; @@ -55,6 +55,7 @@ export const getServerSideProps = async (context) => { // item.availabilities = item.availabilities // .sort((a, b) => b.startTime - a.startTime); + item.availabilities = item.availabilities.filter((a) => new Date(a.startTime) >= new Date() || a.type == AvailabilityType.Weekly); item.assignments = item.assignments .sort((a, b) => b.startTime - a.startTime) .reduce((acc, assignment: Assignment) => { diff --git a/pages/cart/publishers/myschedule.tsx b/pages/cart/publishers/myschedule.tsx index 7fd01b3..d994f9a 100644 --- a/pages/cart/publishers/myschedule.tsx +++ b/pages/cart/publishers/myschedule.tsx @@ -87,30 +87,33 @@ export default function MySchedulePage({ assignments }) { )} -
-
Действия
-
- - + {!assignment.isOld && - -
-
+
+
Действия
+
+ + + + +
+
+ } @@ -205,22 +208,25 @@ export const getServerSideProps = async (context) => { }, }); - const assignments = publisher?.assignments.filter(assignment => assignment.shift.startTime >= lastSunday) || []; + const assignments = publisher?.assignments.filter(a => a.shift.startTime >= lastSunday && a.shift.isPublished) || []; - const transformedAssignments = assignments?.map(assignment => { - if (assignment.shift && assignment.shift.startTime) { - return { - ...assignment, - dateStr: assignment.shift.startTime.toLocaleDateString("bg-BG", { day: "numeric", month: "long" }), - shift: { - ...assignment.shift, - startTime: assignment.shift.startTime.toISOString(), - endTime: assignment.shift.endTime.toISOString(), - }, - }; - } - return assignment; - }); + + const transformedAssignments = assignments?.sort((a, b) => a.shift.startTime - b.shift.startTime) + .map(assignment => { + if (assignment.shift && assignment.shift.startTime) { + return { + ...assignment, + isOld: assignment.shift.startTime < new Date(), + dateStr: assignment.shift.startTime.toLocaleDateString("bg-BG", { day: "numeric", month: "long" }), + shift: { + ...assignment.shift, + startTime: assignment.shift.startTime.toISOString(), + endTime: assignment.shift.endTime.toISOString(), + }, + }; + } + return assignment; + }); diff --git a/pages/cart/publishers/new.tsx b/pages/cart/publishers/new.tsx index c0b1988..14e5dad 100644 --- a/pages/cart/publishers/new.tsx +++ b/pages/cart/publishers/new.tsx @@ -38,22 +38,24 @@ export default function NewPubPage(item: Publisher) { //------------------pages\cart\publishers\edit\[id].tsx------------------ -export const getServerSideProps = async (context) => { - const axios = await axiosServer(context); +// export const getServerSideProps = async (context) => { +// const axios = await axiosServer(context); - context.res.setHeader("Cache-Control", "s-maxage=1, stale-while-revalidate"); - if (!context.query || !context.query.id) { - return { - props: {} - }; - } - var url = process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/publishers/" + context.query.id + "?include=availabilities,shifts"; - console.log("GET PUBLISHER FROM:" + url) - const { data } = await axios.get(url); +// context.res.setHeader("Cache-Control", "s-maxage=1, stale-while-revalidate"); +// if (!context.query || !context.query.id) { +// return { +// props: {} +// }; +// } +// var url = process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/publishers/" + context.query.id + "?include=availabilities,shifts"; +// console.log("GET PUBLISHER FROM:" + url) +// const { data } = await axios.get(url); - return { - props: { - data - }, - }; -}; +// //filter old availabilities +// data.availabilities = data.availabilities.filter((a) => new Date(a.startTime) >= new Date()); +// return { +// props: { +// data +// }, +// }; +// };