popov/mwitnessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix showing transport in calendar popup

Browse Source
This commit is contained in:
Dobromir Popov
2024-05-02 01:24:09 +03:00
parent 1348d6aaea
commit 876b235e54
5 changed files with 125 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/availability/AvailabilityForm.js
View File

@ -19,7 +19,7 @@ const fetchConfig = async () => {
return config.default; return config.default;
}; };
export default function AvailabilityForm({ publisherId, existingItems, inline, onDone, date }) { export default function AvailabilityForm({ publisherId, existingItems, inline, onDone, date, datePicker = false }) {
const router = useRouter(); const router = useRouter();
const urls = { const urls = {
@ -428,15 +428,15 @@ export default function AvailabilityForm({ publisherId, existingItems, inline, o
<ToastContainer></ToastContainer> <ToastContainer></ToastContainer>
<form id="formAv" className="form p-5 bg-white shadow-md rounded-lg" onSubmit={handleSubmit}> <form id="formAv" className="form p-5 bg-white shadow-md rounded-lg" onSubmit={handleSubmit}>
<h3 className="text-xl font-semibold mb-5 text-gray-800 border-b pb-2"> <h3 className="text-xl font-semibold mb-5 text-gray-800 border-b pb-2">
{editMode ? "Редактирай" : "Нова"} възможност: {common.getDateFormatedShort(day)} {editMode ? "Редактирай" : "Нова"} възможност: {common.getDateFormatedShort(new Date(day))}
</h3> </h3>
<LocalizationProvider dateAdapter={AdapterDateFns} localeText={bgBG} adapterLocale={bg}> <LocalizationProvider dateAdapter={AdapterDateFns} localeText={bgBG} adapterLocale={bg}>
{/* <div className="mb-2"> {datePicker && (
<DatePicker label="Изберете дата" value={day} onChange={(value) => setDay({ value })} /> <div className="mb-2">
</div> */} <DatePicker label="Изберете дата" value={day} onChange={setDay} />
</div>
)}
<div className="mb-2"> <div className="mb-2">
<label className="checkbox-container"> <label className="checkbox-container">
<input type="checkbox" checked={doRepeat} className="form-checkbox h-5 w-5 text-gray-600 mx-2" <input type="checkbox" checked={doRepeat} className="form-checkbox h-5 w-5 text-gray-600 mx-2"

1
components/availability/AvailabilityList.js
View File

@ -101,6 +101,7 @@ export default function AvailabilityList({ publisher, showNew }) {
inline={true} inline={true}
existingItems={selectedItem ? [selectedItem] : []} existingItems={selectedItem ? [selectedItem] : []}
date={selectedItem ? new Date(selectedItem.startTime) : new Date()} date={selectedItem ? new Date(selectedItem.startTime) : new Date()}
datePicker={true}
onDone={(item) => { onDone={(item) => {
toggleAv(); toggleAv();
setSelectedItem(null); setSelectedItem(null);

84
pages/api/index.ts
View File

@ -137,7 +137,7 @@ export default async function handler(req, res) {
break; break;
case "getCalendarEvents": case "getCalendarEvents":
let events = await getCalendarEvents(req.query.publisherId, day); let events = await dataHelper.getCalendarEvents(req.query.publisherId, day);
res.status(200).json(events); res.status(200).json(events);
case "getPublisherInfo": case "getPublisherInfo":
@ -354,6 +354,8 @@ export default async function handler(req, res) {
let data = await dataHelper.getCoverMePublisherEmails(parseInt(req.query.shiftId)); let data = await dataHelper.getCoverMePublisherEmails(parseInt(req.query.shiftId));
res.status(200).json(data); res.status(200).json(data);
break; break;
case "getAllPublishersWithStatistics":
res.status(200).json(await dataHelper.getAllPublishersWithStatistics(day));
default: default:
res.status(200).json({ res.status(200).json({
@ -803,86 +805,6 @@ function matchesAvailability(avail, filterDate) {
return avail.startTime >= filterDate && avail.startTime <= filterDateEnd; return avail.startTime >= filterDate && avail.startTime <= filterDateEnd;
} }
async function getCalendarEvents(publisherId, date, availabilities = true, assignments = true) {
const result = [];
// let pubs = await filterPublishers("id,firstName,lastName,email".split(","), "", date, assignments, availabilities, date ? true : false, publisherId);
const prisma = common.getPrismaClient();
let publisher = await prisma.publisher.findUnique({
where: {
id: publisherId
},
select: {
id: true,
firstName: true,
lastName: true,
email: true,
availabilities: {
select: {
id: true,
dayOfMonth: true,
dayofweek: true,
weekOfMonth: true,
startTime: true,
endTime: true,
name: true,
isFromPreviousAssignment: true,
isFromPreviousMonth: true,
repeatWeekly: true,
}
},
assignments: {
select: {
id: true,
shift: {
select: {
id: true,
startTime: true,
endTime: true,
isPublished: true
}
}
}
}
}
});
if (publisher) {
if (availabilities) {
publisher.availabilities?.forEach(item => {
result.push({
...item,
title: common.getTimeFomatted(new Date(item.startTime)) + "-" + common.getTimeFomatted(new Date(item.endTime)), //item.name,
date: new Date(item.startTime),
startTime: new Date(item.startTime),
endTime: new Date(item.endTime),
publisherId: publisher.id,
type: "availability",
isFromPreviousAssignment: item.isFromPreviousAssignment,
});
});
}
if (assignments) {
//only published shifts
publisher.assignments?.filter(
assignment => assignment.shift.isPublished
).forEach(item => {
result.push({
...item,
title: common.getTimeFomatted(new Date(item.shift.startTime)) + "-" + common.getTimeFomatted(new Date(item.shift.endTime)),
date: new Date(item.shift.startTime),
startTime: new Date(item.shift.startTime),
endTime: new Date(item.shift.endTime),
publisherId: item.publisherid,
type: "assignment",
});
});
}
}
return result;
}
async function replaceInAssignment(oldPublisherId, newPublisherId, shiftId) { async function replaceInAssignment(oldPublisherId, newPublisherId, shiftId) {

204
pages/dash.tsx
View File

@ -7,6 +7,8 @@ import { Availability, UserRole } from "@prisma/client";
import ProtectedRoute, { serverSideAuth } from "../components/protectedRoute"; import ProtectedRoute, { serverSideAuth } from "../components/protectedRoute";
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import axiosInstance from '../src/axiosSecure'; import axiosInstance from '../src/axiosSecure';
// const dataHelper = require('../../src/helpers/data');
import dataHelper from '../src/helpers/data';
import { authOptions } from './api/auth/[...nextauth]' import { authOptions } from './api/auth/[...nextauth]'
import { getServerSession } from "next-auth/next" import { getServerSession } from "next-auth/next"
@ -85,106 +87,107 @@ export default function IndexPage({ initialItems, initialUserId }: IProps) {
} }
async function getAvailabilities(userId) { // async function getAvailabilities(userId) {
const prismaClient = common.getPrismaClient(); // const prismaClient = common.getPrismaClient();
const items = await prismaClient.availability.findMany({ // const items = await prismaClient.availability.findMany({
where: { // where: {
publisherId: userId, // publisherId: userId,
}, // },
select: { // select: {
id: true, // id: true,
name: true, // name: true,
isActive: true, // isActive: true,
isFromPreviousAssignment: true, // isFromPreviousAssignment: true,
isFromPreviousMonth: true, // isFromPreviousMonth: true,
dayofweek: true, // dayofweek: true,
dayOfMonth: true, // dayOfMonth: true,
startTime: true, // startTime: true,
endTime: true, // endTime: true,
repeatWeekly: true, // repeatWeekly: true,
endDate: true, // endDate: true,
publisher: { // publisher: {
select: { // select: {
firstName: true, // firstName: true,
lastName: true, // lastName: true,
id: true, // id: true,
}, // },
}, // },
}, // },
}); // });
// Convert Date objects to ISO strings // // Convert Date objects to ISO strings
const serializableItems = items.map(item => ({ // const serializableItems = items.map(item => ({
...item, // ...item,
startTime: item.startTime.toISOString(), // startTime: item.startTime.toISOString(),
endTime: item.endTime.toISOString(), // endTime: item.endTime.toISOString(),
name: common.getTimeFomatted(item.startTime) + "-" + common.getTimeFomatted(item.endTime), // name: common.getTimeFomatted(item.startTime) + "-" + common.getTimeFomatted(item.endTime),
//endDate can be null // //endDate can be null
endDate: item.endDate ? item.endDate.toISOString() : null, // endDate: item.endDate ? item.endDate.toISOString() : null,
type: 'availability', // type: 'availability',
// Convert other Date fields similarly if they exist // // Convert other Date fields similarly if they exist
})); // }));
/*model Assignment { // /*model Assignment {
id Int @id @default(autoincrement()) // id Int @id @default(autoincrement())
shift Shift @relation(fields: [shiftId], references: [id], onDelete: Cascade) // shift Shift @relation(fields: [shiftId], references: [id], onDelete: Cascade)
shiftId Int // shiftId Int
publisher Publisher @relation(fields: [publisherId], references: [id], onDelete: Cascade) // publisher Publisher @relation(fields: [publisherId], references: [id], onDelete: Cascade)
publisherId String // publisherId String
isActive Boolean @default(true) // isActive Boolean @default(true)
isConfirmed Boolean @default(false) // isConfirmed Boolean @default(false)
isWithTransport Boolean @default(false) // isWithTransport Boolean @default(false)
Report Report[] // Report Report[]
}*/ // }*/
//get assignments for this user // //get assignments for this user
const assignments = await prismaClient.assignment.findMany({ // const assignments = await prismaClient.assignment.findMany({
where: { // where: {
publisherId: userId, // publisherId: userId,
}, // },
select: { // select: {
id: true, // id: true,
isBySystem: true, // isBySystem: true,
isConfirmed: true, // isConfirmed: true,
isWithTransport: true, // isWithTransport: true,
shift: { // shift: {
select: { // select: {
id: true, // id: true,
name: true, // name: true,
startTime: true, // startTime: true,
endTime: true, // endTime: true,
//select all assigned publishers names as name - comma separated // //select all assigned publishers names as name - comma separated
assignments: { // assignments: {
select: { // select: {
publisher: { // publisher: {
select: { // select: {
firstName: true, // firstName: true,
lastName: true, // lastName: true,
} // }
} // }
} // }
} // }
} // }
} // }
} // }
}); // });
const serializableAssignments = assignments.map(item => ({ // const serializableAssignments = assignments.map(item => ({
...item, // ...item,
startTime: item.shift.startTime.toISOString(), // startTime: item.shift.startTime.toISOString(),
endTime: item.shift.endTime.toISOString(), // endTime: item.shift.endTime.toISOString(),
// name: item.shift.publishers.map(p => p.firstName + " " + p.lastName).join(", "), // // 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: 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.getTimeFomatted(new Date(item.shift.startTime)) + "-" + common.getTimeFomatted(new Date(item.shift.endTime)),
type: 'assignment', // type: 'assignment',
//delete shift object // //delete shift object
shift: null, // shift: null,
publisher: { id: userId } // publisher: { id: userId }
})); // }));
serializableItems.push(...serializableAssignments); // serializableItems.push(...serializableAssignments);
return serializableItems; // return serializableItems;
// }
}
export const getServerSideProps = async (context) => { export const getServerSideProps = async (context) => {
const auth = await serverSideAuth({ const auth = await serverSideAuth({
req: context.req, req: context.req,
@ -198,7 +201,16 @@ export const getServerSideProps = async (context) => {
console.log("server role: " + role); console.log("server role: " + role);
const userId = session?.user.id; const userId = session?.user.id;
var items = await getAvailabilities(session.user.id); var items = await dataHelper.getCalendarEvents(session.user.id);
// common.convertDatesToISOStrings(items);
//serializable dates
items = items.map(item => ({
...item,
startTime: item.startTime.toISOString(),
endTime: item.endTime.toISOString(),
date: item.date.toISOString(),
}));
return { return {
props: { props: {

10
src/helpers/common.js
View File

@ -101,16 +101,18 @@ Date.prototype.getDayEuropean = function () {
}; };
// Helper function to convert month name to 0-based index // Helper function to convert month name to 0-based index
exports.getMonthNames = function () {
return ["януари", "февруари", "март", "април", "май", "юни", "юли", "август", "септември", "октомври", "ноември", "декември"];
}
exports.getMonthIndex = function (monthName) { exports.getMonthIndex = function (monthName) {
const monthNames = ["януари", "февруари", "март", "април", "май", "юни", "юли", "август", "септември", "октомври", "ноември", "декември"]; return exports.getMonthNames().indexOf(monthName.toLowerCase());
return monthNames.indexOf(monthName.toLowerCase());
}; };
exports.getMonthName = function (monthIndex) { exports.getMonthName = function (monthIndex) {
const monthNames = ["януари", "февруари", "март", "април", "май", "юни", "юли", "август", "септември", "октомври", "ноември", "декември"]; return exports.getMonthNames()[monthIndex];
return monthNames[monthIndex];
}; };
exports.getMonthNameEn = function (monthIndex) { exports.getMonthNameEn = function (monthIndex) {
const monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; const monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
return monthNames[monthIndex]; return monthNames[monthIndex];