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

renames

Browse Source
This commit is contained in:
Dobromir Popov
2024-03-26 01:08:57 +02:00
parent 3fcdfc1347
commit acd776e988
37 changed files with 143 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/helpers/data.js
View File

@ -147,7 +147,7 @@ async function getAvailabilities(userId) {
select: {
id: true,
name: true,
isactive: true,
isActive: true,
isFromPreviousAssignment: true,
dayofweek: true,
dayOfMonth: true,
@ -182,7 +182,7 @@ async function getAvailabilities(userId) {
shiftId Int
publisher Publisher @relation(fields: [publisherId], references: [id], onDelete: Cascade)
publisherId String
isactive Boolean @default(true)
isActive Boolean @default(true)
isConfirmed Boolean @default(false)
isWithTransport Boolean @default(false)
Report Report[]
@ -194,7 +194,7 @@ async function getAvailabilities(userId) {
},
select: {
id: true,
isTentative: true,
isBySystem: true,
isConfirmed: true,
isWithTransport: true,
shift: {

14
src/helpers/excel.js
View File

@ -323,21 +323,21 @@ exports.processEvents = async function (events, year, monthNumber, progressCallb
}
var shifts = await prisma.shift.findMany({
where: {
isactive: true,
isActive: true,
startTime: {
gte: monthDatesInfo.firstMonday,
lt: monthDatesInfo.lastSunday,
},
}
});
var locations = await prisma.location.findMany({ where: { isactive: true, } });
var locations = await prisma.location.findMany({ where: { isActive: true, } });
var cartEvents = await prisma.cartEvent.findMany({ where: { isactive: true, } });
var cartEvents = await prisma.cartEvent.findMany({ where: { isActive: true, } });
var publishers = await prisma.publisher.findMany({
where: { isactive: true, },
where: { isActive: true, },
include: {
availabilities: { where: { isactive: true, }, },
availabilities: { where: { isActive: true, }, },
assignments: { include: { shift: true, }, },
},
});
@ -472,7 +472,7 @@ exports.processEvents = async function (events, year, monthNumber, progressCallb
email: name.toLowerCase().replace(/ /g, "."), // + "@gmail.com"
firstName: firstname,
lastName: lastname,
isactive: true,
isActive: true,
isImported: true,
// role: "EXTERNAL",
};
@ -492,7 +492,7 @@ exports.processEvents = async function (events, year, monthNumber, progressCallb
// endTime: endTime,
// name: `от предишен график, ${publisher.firstName} ${publisher.lastName}`,
// isFromPreviousAssignment: true,
// isactive: true,
// isActive: true,
// },
// });
// console.log(`Created WEEKLY availability with ID ${availability.id} for date '${date.toDateString()}' and publisher '${publisher.firstName} ${publisher.lastName}'`);

4
src/sql/dev-test.sql
View File

@ -11,7 +11,7 @@ SELECT DISTINCT Publisher.*
FROM Publisher
INNER JOIN Availability ON Availability.publisherId = Publisher.id
WHERE
Availability.isactive = true
Availability.isActive = true
AND ( (
Availability.dayOfMonth IS NOT NULL
AND Availability.startTime <= '2023-03-30 13:00:00'
@ -30,7 +30,7 @@ SELECT DISTINCT Publisher.*
FROM Publisher
INNER JOIN Availability ON Availability.publisherId = Publisher.id
WHERE
Availability.isactive = true
Availability.isActive = true
AND (Availability.dayOfMonth = 5) clfuyo33e005aknvchf1wm3bu All publishers: 121;
(118) unique,