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

wip stats

Browse Source
This commit is contained in:
Dobromir Popov
2024-05-04 14:30:20 +03:00
parent 17b8adbab8
commit c7980f46bb
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pages/api/index.ts
View File

@ -355,7 +355,8 @@ export default async function handler(req, res) {
res.status(200).json(data); res.status(200).json(data);
break; break;
case "getAllPublishersWithStatistics": case "getAllPublishersWithStatistics":
res.status(200).json(await dataHelper.getAllPublishersWithStatistics(day)); let noEndDate = common.parseBool(req.query.noEndDate);
res.status(200).json(await dataHelper.getAllPublishersWithStatistics(day, noEndDate));
default: default:
res.status(200).json({ res.status(200).json({

5
pages/cart/publishers/stats.tsx
View File

@ -67,6 +67,7 @@ function ContactsPage({ allPublishers }) {
}); });
} }
setFilteredPublishers(filtered); setFilteredPublishers(filtered);
setPubWithAssignmentsCount(filtered.filter(publisher => publisher.currentMonthAvailabilityHoursCount && publisher.currentMonthAvailabilityHoursCount > 0).length);
}, [searchQuery, publisherType, sortField, sortOrder, allPublishers]); }, [searchQuery, publisherType, sortField, sortOrder, allPublishers]);
useEffect(() => { useEffect(() => {
@ -75,7 +76,7 @@ function ContactsPage({ allPublishers }) {
const month = parseInt(selectedMonth); const month = parseInt(selectedMonth);
const filterDate = new Date(new Date().getFullYear(), month - 1, 15); const filterDate = new Date(new Date().getFullYear(), month - 1, 15);
try { try {
const response = await axiosInstance.get(`/api/?action=getAllPublishersWithStatistics&date=${filterDate.toISOString()}`); const response = await axiosInstance.get(`/api/?action=getAllPublishersWithStatistics&date=${filterDate.toISOString()}&noEndDate=false`);
setPublishers(response.data); setPublishers(response.data);
setFilteredPublishers(response.data); setFilteredPublishers(response.data);
@ -101,7 +102,7 @@ function ContactsPage({ allPublishers }) {
<ProtectedRoute allowedRoles={[UserRole.ADMIN, UserRole.POWERUSER, UserRole.USER]}> <ProtectedRoute allowedRoles={[UserRole.ADMIN, UserRole.POWERUSER, UserRole.USER]}>
<div className="container mx-auto p-4"> <div className="container mx-auto p-4">
<h1 className="text-xl font-semibold mb-4">Статистика </h1> <h1 className="text-xl font-semibold mb-4">Статистика </h1>
<h5 className="text-lg font-semibold mb-4">{pubWithAssignmentsCount} участника с предпочитания за месеца (от {allPublishers.length} )</h5> <h5 className="text-lg font-semibold mb-4">{pubWithAssignmentsCount} участника с предпочитания за месеца (от {filteredPublishers.length} )</h5>
<div className="mb-4 flex justify-between items-center"> <div className="mb-4 flex justify-between items-center">
<input <input
type="text" type="text"

4
src/helpers/data.js
View File

@ -472,13 +472,13 @@ async function filterPublishersNew(selectFields, filterDate, isExactTime = false
} }
//ToDo: refactor this function //ToDo: refactor this function
async function getAllPublishersWithStatistics(filterDate) { async function getAllPublishersWithStatistics(filterDate, noEndDateFilter = false) {
const prisma = common.getPrismaClient(); const prisma = common.getPrismaClient();
const monthInfo = common.getMonthDatesInfo(new Date(filterDate)); const monthInfo = common.getMonthDatesInfo(new Date(filterDate));
const dateStr = new Date(monthInfo.firstMonday).toISOString().split('T')[0]; const dateStr = new Date(monthInfo.firstMonday).toISOString().split('T')[0];
let publishers = await filterPublishersNew('id,firstName,lastName,email,isActive,desiredShiftsPerMonth,lastLogin,type', dateStr, false, true, true, true, true); let publishers = await filterPublishersNew('id,firstName,lastName,email,isActive,desiredShiftsPerMonth,lastLogin,type', dateStr, false, true, noEndDateFilter, true, true);
// const axios = await axiosServer(context); // const axios = await axiosServer(context);
// const { data: publishers } = await axios.get(`api/?action=filterPublishers&assignments=true&availabilities=true&date=${dateStr}&select=id,firstName,lastName,isActive,desiredShiftsPerMonth`); // const { data: publishers } = await axios.get(`api/?action=filterPublishers&assignments=true&availabilities=true&date=${dateStr}&select=id,firstName,lastName,isActive,desiredShiftsPerMonth`);