Merge commit 'af8a62a5261239b558da53a2af1c4d76398696d7' into production
This commit is contained in:
@ -481,21 +481,22 @@ exports.processEvents = async function (events, year, monthNumber, progressCallb
|
||||
|
||||
// create availability with the same date as the event.
|
||||
//ToDo: add parameter to control if we want to create availability for each event. can be done whe we import previous shifts.
|
||||
if (createAvailabilities) {
|
||||
const dayofWeek = common.getDayOfWeekNameEnEnum(date);
|
||||
const availability = await prisma.availability.create({
|
||||
data: {
|
||||
publisherId: publisher.id,
|
||||
dayofweek: dayofWeek,
|
||||
startTime: startTime,
|
||||
endTime: endTime,
|
||||
name: `от график, ${publisher.firstName} ${publisher.lastName}`,
|
||||
isFromPreviousAssignment: true,
|
||||
isActive: true,
|
||||
},
|
||||
});
|
||||
console.log(`Created WEEKLY availability with ID ${availability.id} for date '${date.toDateString()}' and publisher '${publisher.firstName} ${publisher.lastName}'`);
|
||||
}
|
||||
// if (createAvailabilities) {
|
||||
// const dayofWeek = common.getDayOfWeekNameEnEnum(date);
|
||||
// const availability = await prisma.availability.create({
|
||||
// data: {
|
||||
// publisherId: publisher.id,
|
||||
// dayofweek: dayofWeek,
|
||||
// startTime: startTime,
|
||||
// endTime: endTime,
|
||||
// name: `от график, ${publisher.firstName} ${publisher.lastName}`,
|
||||
// isFromPreviousAssignment: true,
|
||||
// isActive: true,
|
||||
// },
|
||||
// });
|
||||
// console.log(`Created WEEKLY availability with ID ${availability.id} for date '${date.toDateString()}' and publisher '${publisher.firstName} ${publisher.lastName}'`);
|
||||
// }
|
||||
|
||||
const personResponse = await axiosInstance.post("/publishers", manualPub);
|
||||
// let personId = personResponse.data.id;
|
||||
|
||||
@ -533,25 +534,25 @@ exports.processEvents = async function (events, year, monthNumber, progressCallb
|
||||
//ToDo: fix findPublisherAvailability and creation of availabilities
|
||||
// check if there is an availability for this publisher on this date, and if not, create one
|
||||
//ToDo: check if that works
|
||||
const availability = await data.findPublisherAvailability(publisher.id, start);
|
||||
if (!availability && createAvailabilities) {
|
||||
const dayofWeek = common.getDayOfWeekNameEnEnum(date);
|
||||
const availability = await prisma.availability.create({
|
||||
data: {
|
||||
publisherId: publisher.id,
|
||||
//date: date,
|
||||
dayofweek: dayofWeek,
|
||||
//weekOfMonth: common.getWeekOfMonth(date),
|
||||
startTime: start,
|
||||
endTime: end,
|
||||
name: `от предишен график, ${publisher.firstName} ${publisher.lastName}`,
|
||||
isFromPreviousAssignment: true,
|
||||
isWithTransportIn: isWithTransport && event.shiftNr == 1,
|
||||
isWithTransportOut: isWithTransport && event.shiftNr > 1,
|
||||
},
|
||||
});
|
||||
console.log(`Created SYSTEM availability with ID ${availability.id} for date '${date.toDateString()}' and publisher '${publisher.firstName} ${publisher.lastName}'`);
|
||||
}
|
||||
// const availability = await data.findPublisherAvailability(publisher.id, start);
|
||||
// if (!availability && createAvailabilities) {
|
||||
// const dayofWeek = common.getDayOfWeekNameEnEnum(date);
|
||||
// const availability = await prisma.availability.create({
|
||||
// data: {
|
||||
// publisherId: publisher.id,
|
||||
// //date: date,
|
||||
// dayofweek: dayofWeek,
|
||||
// //weekOfMonth: common.getWeekOfMonth(date),
|
||||
// startTime: start,
|
||||
// endTime: end,
|
||||
// name: `от предишен график, ${publisher.firstName} ${publisher.lastName}`,
|
||||
// isFromPreviousAssignment: true,
|
||||
// isWithTransportIn: isWithTransport && event.shiftNr == 1,
|
||||
// isWithTransportOut: isWithTransport && event.shiftNr > 1,
|
||||
// },
|
||||
// });
|
||||
// console.log(`Created SYSTEM availability with ID ${availability.id} for date '${date.toDateString()}' and publisher '${publisher.firstName} ${publisher.lastName}'`);
|
||||
// }
|
||||
|
||||
console.log(`Created assignment with ID ${assignment.id} for date '${date.toDateString()}' and location '${event.placeOfEvent}'. publisher: ${publisher.firstName} ${publisher.lastName}}`);
|
||||
}
|
||||
|
Reference in New Issue
Block a user