Merge branch 'feature-fixStats'

_doc/ToDo.md

@@ -238,3 +238,6 @@ in schedule admin - if a publisher is always pair & family is not in the shift -
 [] new page to show EventLog (substitutions)
 []  fix "login as"
 [] list with open shift replacements (coverMe requests)
+[] fix statistics
+[] add notification to statistics info
+[] fix logins (apple/azure)

components/ConfirmationModal.tsx

@@ -1,29 +1,29 @@
 import zIndex from "@mui/material/styles/zIndex";
+import ReactDOM from 'react-dom';
 
 export default function ConfirmationModal({ isOpen, onClose, onConfirm, message }) {
   //export default function ConfirmationModal({ isOpen, onClose, onConfirm, message })
   if (!isOpen) return null;
 
-  return (
+  const modalContent = (
-    <div className="opacity-100 fixed inset-0 flex items-center justify-center z-1002" >
+    <div className="modal-container opacity-100 inset-0 flex items-center justify-center z-1152">
-      <div className="bg-white p-4 rounded-md shadow-lg modal-content" style={{ zIndex: 1002 }}>
+      <div className="bg-white p-4 rounded-md shadow-lg modal-content">
         <p className="mb-4">{message}</p>
-        <button
+        <button className="bg-red-500 text-white px-4 py-2 rounded mr-2" onClick={onConfirm}>
-          className="bg-red-500 text-white px-4 py-2 rounded mr-2"
-          onClick={onConfirm}
-        >
           Потвтрждавам
         </button>
-        <button
+        <button className="bg-gray-300 px-4 py-2 rounded" onClick={onClose}>
-          className="bg-gray-300 px-4 py-2 rounded"
-          onClick={onClose}
-        >
           Отказвам
         </button>
       </div>
       <div className="fixed inset-0 bg-black opacity-50 modal-overlay" onClick={onClose}></div>
     </div>
   );
+
+  return ReactDOM.createPortal(
+    modalContent,
+    document.getElementById('modal-root')
+  );
 };
 // const CustomCalendar = ({ month, year, shifts }) => {
 // export default function CustomCalendar({ date, shifts }: CustomCalendarProps) {

components/layout.tsx

@@ -63,6 +63,7 @@ export default function Layout({ children }) {
             <div className="">
               {children}
             </div>
+            <div id="modal-root"></div>  {/* Modal container */}
           </main>
         </div>
       </div>

components/publisher/PublisherForm.js

@@ -221,6 +221,15 @@ export default function PublisherForm({ item, me }) {
                 </div>
               </div>
             </div>
+            {/* language preference */}
+            <div className="mb-4">
+              <label className="label" htmlFor="locale">Език (в разработка)</label>
+              <select id="locale" name="locale" value={publisher.locale} onChange={handleChange} className="select textbox" placeholder="Език" autoFocus >
+                <option value="bg" >Български</option>
+                <option value="en">English</option>
+                <option value="ru">Руски</option>
+              </select>
+            </div>
             <div className="mb-4">
               <label className="label" htmlFor="town">Град</label>
               <input type="text" id="town" name="town" value={publisher.town} onChange={handleChange} className="textbox" placeholder="Град" autoFocus />

components/publisher/PublisherSearchBox.js

@@ -127,7 +127,7 @@ function PublisherSearchBox({ id, selectedId, onChange, isFocused, filterDate, s
             ) : null}
             {showList ? (
                 // Display only clickable list of all publishers
-                <ul className="absolute bg-white border border-gray-300 w-full z-10">
+                <ul className="absolute bg-white border border-gray-300 w-full z-10 overflow-y-auto">
                     {publishers.map((publisher) => (
                         <li key={publisher.id}
                             className="p-2 cursor-pointer hover:bg-gray-200"
@@ -136,8 +136,9 @@ function PublisherSearchBox({ id, selectedId, onChange, isFocused, filterDate, s
                         </li>
                     ))}
                 </ul>
-            ) : null}
+            ) : null
-        </div>
+            }
+        </div >
     );
 }
 

pages/api/auth/[...nextauth].ts

@@ -70,21 +70,6 @@ export const authOptions: NextAuthOptions = {
         password: { label: "Парола", type: "password" }
       },
       async authorize(credentials, req) {
-        //const user = { id: "1", name: "Администратора", email: "jsmith@example.com" }
-        //return user
-        // const res = await fetch("/your/endpoint", {
-        //   method: 'POST',
-        //   body: JSON.stringify(credentials),
-        //   headers: { "Content-Type": "application/json" }
-        // })
-        // const user = await res.json()
-
-        // // If no error and we have user data, return it
-        // if (res.ok && user) {
-        //   return user
-        // }
-        // // Return null if user data could not be retrieved
-        // return null
         const users = [
           { id: "1", name: "admin", email: "admin@example.com", password: "admin123", role: "ADMIN", static: true },
           { id: "2", name: "krasi", email: "krasi@example.com", password: "krasi123", role: "ADMIN", static: true },
@@ -272,6 +257,8 @@ export const authOptions: NextAuthOptions = {
     verifyRequest: "/auth/verify-request", // (used for check email message)
     newUser: null // If set, new users will be directed here on first sign in
   },
+
+  debug: process.env.NODE_ENV === 'development',
 }
 
 export default NextAuth(authOptions)

pages/api/index.ts

@@ -361,7 +361,8 @@ export default async function handler(req, res) {
         res.status(200).json(data);
         break;
       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:
         res.status(200).json({
@@ -834,8 +835,8 @@ async function replaceInAssignment(oldPublisherId, newPublisherId, shiftId) {
     where: {
       id: shiftId
     },
-    select: {
+
-      startTime: true,
+    include: {
       cartEvent: {
         select: {
           location: {
@@ -844,9 +845,7 @@ async function replaceInAssignment(oldPublisherId, newPublisherId, shiftId) {
             }
           }
         }
-      }
+      },
-    },
-    include: {
       assignments: {
         include: {
           publisher: {
@@ -879,7 +878,7 @@ async function replaceInAssignment(oldPublisherId, newPublisherId, shiftId) {
       publisher: { connect: { id: oldPublisherId } },
       shift: { connect: { id: shiftId } },
       type: EventLogType.AssignmentReplacementManual,
-      content: "Въведено заместване от " + originalPublisher.firstName + " " + originalPublisher.lastName + ". Ще го замества " + newPublisher.firstName + " " + newPublisher.lastName + "."
+      content: "Заместване въведено от " + originalPublisher.firstName + " " + originalPublisher.lastName + ". Ще го замества " + newPublisher.firstName + " " + newPublisher.lastName + "."
 
     }
   });

pages/cart/publishers/index.tsx

@@ -8,11 +8,13 @@ import Layout from "../../../components/layout";
 import PublisherCard from "../../../components/publisher/PublisherCard";
 import axiosInstance from "../../../src/axiosSecure";
 import axiosServer from '../../../src/axiosServer';
+const common = require("../../../src/helpers/common");
 import toast from "react-hot-toast";
 
 import { levenshteinEditDistance } from "levenshtein-edit-distance";
 import ProtectedRoute from '../../../components/protectedRoute';
 import ConfirmationModal from '../../../components/ConfirmationModal';
+import { relative } from "path";
 
 
 
@@ -164,7 +166,7 @@ function PublishersPage({ publishers = [] }: IProps) {
   return (
     <Layout>
       <ProtectedRoute allowedRoles={[UserRole.ADMIN, UserRole.POWERUSER]}>
-        <div className="">
+        <div className="mx-auto ">
           <div className="flex items-center justify-center space-x-4 m-4">
             <div className="flex justify-center m-4">
               <a href="/cart/publishers/new" className="btn">Добави вестител</a>
@@ -195,23 +197,24 @@ function PublishersPage({ publishers = [] }: IProps) {
             </div>
           </div>
 
-          <div name="filters" className="flex items-center justify-center space-x-4 m-4 sticky top-4 z-10 bg-gray-100 p-2">
+          <div className="z-60 sticky top-0" style={{ zIndex: 60, position: relative }}>
-            <label htmlFor="filter">Filter:</label>
+            <div name="filters" className="flex items-center justify-center space-x-4 m-4 bg-gray-100 p-2" >
-            <input type="text" id="filter" name="filter" value={filter} onChange={handleFilterChange}
+              <label htmlFor="filter">Filter:</label>
-              className="border border-gray-300 rounded-md px-2 py-1"
+              <input type="text" id="filter" name="filter" value={filter} onChange={handleFilterChange}
-            />
+                className="border border-gray-300 rounded-md px-2 py-1"
-
-            <label htmlFor="zeroShiftsOnly" className="ml-4 inline-flex items-center">
-              <input type="checkbox" id="zeroShiftsOnly" checked={showZeroShiftsOnly}
-                onChange={e => setShowZeroShiftsOnly(e.target.checked)}
-                className="form-checkbox text-indigo-600"
               />
-              <span className="ml-2">само без смени</span>
-            </label>
 
-            <span id="filter-info" className="ml-4">{publishers.length} от {publishers.length} вестителя</span>
+              <label htmlFor="zeroShiftsOnly" className="ml-4 inline-flex items-center">
+                <input type="checkbox" id="zeroShiftsOnly" checked={showZeroShiftsOnly}
+                  onChange={e => setShowZeroShiftsOnly(e.target.checked)}
+                  className="form-checkbox text-indigo-600"
+                />
+                <span className="ml-2">само без смени</span>
+              </label>
+
+              <span id="filter-info" className="ml-4">{publishers.length} от {publishers.length} вестителя</span>
+            </div>
           </div>
-
           <div className="grid gap-4 grid-cols-1 md:grid-cols-4 z-0">
             {renderPublishers()}
           </div>
@@ -226,9 +229,38 @@ export default PublishersPage;
 //import { set } from "date-fns";
 
 export const getServerSideProps = async (context) => {
-  const axios = await axiosServer(context);
+  // const axios = await axiosServer(context);
-  //ToDo: refactor all axios calls to use axiosInstance and this URL
+  // //ToDo: refactor all axios calls to use axiosInstance and this URL
-  const { data: publishers } = await axios.get('/api/data/publishers?select=id,firstName,lastName,email,isActive,isTrained,isImported,assignments.shift.startTime,availabilities.startTime&dev=fromuseefect');
+  // const { data: publishers } = await axios.get('/api/data/publishers?select=id,firstName,lastName,email,isActive,isTrained,isImported,assignments.shift.startTime,availabilities.startTime&dev=fromuseefect');
+  //use prisma instead of axios
+  const prisma = common.getPrismaClient();
+  let publishers = await prisma.publisher.findMany({
+    select: {
+      id: true,
+      firstName: true,
+      lastName: true,
+      email: true,
+      isActive: true,
+      isTrained: true,
+      isImported: true,
+      assignments: {
+        select: {
+          shift: {
+            select: {
+              startTime: true,
+            },
+          },
+        },
+      },
+      availabilities: {
+        select: {
+          startTime: true,
+        },
+      },
+    }
+  });
+  publishers = JSON.parse(JSON.stringify(publishers));
+
 
   return {
     props: {

pages/cart/publishers/myschedule.tsx

@@ -14,6 +14,8 @@ import { useSession, getSession } from 'next-auth/react';
 import axiosInstance from 'src/axiosSecure';
 import { toast } from 'react-toastify';
 import LocalShippingIcon from '@mui/icons-material/LocalShipping';
+import { getServerSession } from 'next-auth';
+import { authOptions } from 'pages/api/auth/[...nextauth]';
 
 export default function MySchedulePage({ assignments }) {
 
@@ -160,7 +162,7 @@ export default function MySchedulePage({ assignments }) {
 //get future assignments for the current user (session.user.id)
 
 export const getServerSideProps = async (context) => {
-    const session = await getSession(context);
+    const session = await getServerSession(context.req, context.res, authOptions)
 
     context.res.setHeader("Cache-Control", "s-maxage=1, stale-while-revalidate");
 

pages/cart/publishers/stats.tsx

@@ -1,62 +1,201 @@
-import { useState } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import Layout from "../../../components/layout";
 import ProtectedRoute from '../../../components/protectedRoute';
-import { Prisma, UserRole } from '@prisma/client';
+import { Prisma, UserRole, PublisherType } from '@prisma/client';
 import axiosServer from '../../../src/axiosServer';
 import common from '../../../src/helpers/common';
 // import { filterPublishers, /* other functions */ } from '../../api/index';
 import data from '../../../src/helpers/data';
+import axiosInstance from '../../../src/axiosSecure';
+import { setFlagsFromString } from 'v8';
+import { set } from 'date-fns';
 
-// const data = require('../../src/helpers/data');
+function ContactsPage({ allPublishers }) {
+
+    const currentMonth = new Date().getMonth();
+    const [selectedMonth, setSelectedMonth] = useState(currentMonth + 1);
+    const isMounted = useRef(false);
 
-function ContactsPage({ publishers, allPublishers }) {
     const [searchQuery, setSearchQuery] = useState('');
+    const [publisherType, setPublisherType] = useState('');
+    const [publishers, setPublishers] = useState(allPublishers);
+    const [pubWithAssignmentsCount, setPubWithAssignmentsCount] = useState(0);
+    const [filteredPublishers, setFilteredPublishers] = useState(allPublishers);
 
-    const filteredPublishers = allPublishers.filter((publisher) =>
+    const [sortField, setSortField] = useState('name');
-        publisher.firstName.toLowerCase().includes(searchQuery.toLowerCase()) ||
+    const [sortOrder, setSortOrder] = useState('asc');
-        publisher.lastName.toLowerCase().includes(searchQuery.toLowerCase()) ||
+
-        publisher.email.toLowerCase().includes(searchQuery.toLowerCase()) ||
+    const months = common.getMonthNames();
-        publisher.phone?.toLowerCase().includes(searchQuery.toLowerCase())
+    const subsetMonths = Array.from({ length: 9 }, (_, i) => {
-    );
+        const monthIndex = (currentMonth - 3 + i + 12) % 12; // Adjust for year wrap-around
+        return {
+            name: months[monthIndex],
+            index: monthIndex + 1
+        };
+    });
+
+    const [hideEmptyFields, setHideEmptyFields] = useState({
+        availability: false,
+        assignments: false,
+        lastLogin: false
+    });
+
+    function handleSort(field) {
+        const order = sortField === field && sortOrder === 'asc' ? 'desc' : 'asc';
+        setSortField(field);
+        setSortOrder(order);
+    }
+
+    useEffect(() => {
+        let filtered = allPublishers.filter(publisher =>
+            (publisher.firstName.toLowerCase().includes(searchQuery.toLowerCase()) ||
+                publisher.lastName.toLowerCase().includes(searchQuery.toLowerCase()) ||
+                publisher.email.toLowerCase().includes(searchQuery.toLowerCase()) ||
+                (publisher.phone?.toLowerCase().includes(searchQuery.toLowerCase())))
+            && (publisherType ? publisher.type === publisherType : true)
+            && (!hideEmptyFields.availability || publisher.currentMonthAvailabilityDaysCount > 0)
+            && (!hideEmptyFields.assignments || publisher.currentMonthAssignments > 0)
+            && (!hideEmptyFields.lastLogin || publisher.lastLogin)
+        );
+
+        if (sortField) {
+            filtered.sort((a, b) => {
+                // Check for undefined or null values and treat them as "larger" when sorting ascending
+                const aValue = a[sortField] || 0;  // Treat undefined, null as 0
+                const bValue = b[sortField] || 0;  // Treat undefined, null as 0
+
+                if (aValue === 0 && bValue !== 0) return 1; // aValue is falsy, push it to end if asc
+                if (bValue === 0 && aValue !== 0) return -1; // bValue is falsy, push it to end if asc
+
+                if (aValue < bValue) return sortOrder === 'asc' ? -1 : 1;
+                if (aValue > bValue) return sortOrder === 'asc' ? 1 : -1;
+                return 0;
+            });
+        }
+        setFilteredPublishers(filtered);
+        setPubWithAssignmentsCount(filtered.filter(publisher => publisher.currentMonthAvailabilityHoursCount && publisher.currentMonthAvailabilityHoursCount > 0).length);
+    }, [searchQuery, publisherType, sortField, sortOrder, allPublishers, hideEmptyFields]);
+
+    useEffect(() => {
+        if (isMounted.current) {
+            const fetchData = async () => {
+                const month = parseInt(selectedMonth);
+                const filterDate = new Date(new Date().getFullYear(), month - 1, 15);
+                try {
+                    const response = await axiosInstance.get(`/api/?action=getAllPublishersWithStatistics&date=${filterDate.toISOString()}&noEndDate=false`);
+                    setPublishers(response.data);
+                    setFilteredPublishers(response.data);
+
+                    setPubWithAssignmentsCount(response.data.filter(publisher => publisher.currentMonthAvailabilityHoursCount && publisher.currentMonthAvailabilityHoursCount > 0).length);
+                } catch (error) {
+                    console.error('Failed to fetch publishers data:', error);
+                    // Optionally, handle errors more gracefully here
+                }
+            };
+            fetchData();
+        } else {
+            // Set the ref to true after the initial render
+            isMounted.current = true;
+        }
+    }, [selectedMonth]);  // Dependency array includes only selectedMonth
+
+    function renderSortArrow(field) {
+        return sortField === field ? sortOrder === 'asc' ? ' ↑' : ' ↓' : '';
+    }
 
     return (
         <Layout>
             <ProtectedRoute allowedRoles={[UserRole.ADMIN, UserRole.POWERUSER]}>
                 <div className="container mx-auto p-4">
                     <h1 className="text-xl font-semibold mb-4">Статистика </h1>
-                    <h5 className="text-lg font-semibold mb-4">{publishers.length} участника с предпочитания за месеца (от {allPublishers.length} )</h5>
+                    <h5 className="text-lg font-semibold mb-4">{pubWithAssignmentsCount} участника с предпочитания за месеца (от {filteredPublishers.length} )</h5>
-                    <input
+                    <div className="mb-4 flex justify-between items-center">
-                        type="text"
+                        <input name="filterText"
-                        placeholder="Търси по име, имейл или телефон..."
+                            type="text"
-                        value={searchQuery}
+                            placeholder="Търси по име, имейл или телефон..."
-                        onChange={(e) => setSearchQuery(e.target.value)}
+                            value={searchQuery}
-                        className="border border-gray-300 rounded-md px-2 py-2 mb-4 w-full text-base md:text-sm"
+                            onChange={(e) => setSearchQuery(e.target.value)}
-                    />
+                            className="border border-gray-300 rounded-md px-2 py-2 text-base md:text-sm flex-grow mr-2"
+                        />
+                        {/* Month dropdown */}
+                        <select name="filterMonth"
+                            className="border border-gray-300 rounded-md px-2 py-2 text-base md:text-sm"
+                            value={selectedMonth}
+                            onChange={(e) => setSelectedMonth(e.target.value)}
+                        >
+                            <option value="">избери месец</option>
+                            {subsetMonths.map((month) => (
+                                <option key={month.index} value={month.index}>{month.name}</option>
+                            ))}
+                        </select>
+                        {/* Publisher type dropdown */}
+                        <select name="filterType"
+                            className="border border-gray-300 rounded-md px-2 py-2 text-base md:text-sm"
+                            value={publisherType}
+                            onChange={(e) => setPublisherType(e.target.value)}
+                        >
+                            <option value="">Всички типове</option>
+                            {Object.keys(PublisherType).map((type) => (
+                                <option key={type} value={PublisherType[type]}>{PublisherType[type]}</option>
+                            ))}
+                        </select>
+                    </div>
                     <div className="overflow-x-auto">
                         <table className="w-full text-left border-collapse">
                             <thead>
                                 <tr>
-                                    <th className="border-b font-medium p-4 pl-8 pt-0 pb-3">Име</th>
+                                    <th className="border-b font-medium p-4 pl-8 pt-0 pb-3 cursor-pointer" onClick={() => handleSort('name')}>
-                                    <th className="border-b font-medium p-4 pt-0 pb-3">Възможности</th>
+                                        Име{renderSortArrow('name')}
-                                    <th className="border-b font-medium p-4 pt-0 pb-3">Участия</th>
+                                    </th>
-                                    <th className="border-b font-medium p-4 pt-0 pb-3">Последно влизане</th>
+                                    <th className="border-b font-medium p-4 pt-0 pb-3 cursor-pointer" >
+                                        <p className="inline-block" onClick={() => handleSort('currentMonthAvailabilityDaysCount')}>
+                                            Възможности{renderSortArrow('currentMonthAvailabilityDaysCount')}
+                                        </p>
+                                        <input
+                                            type="checkbox" className='ml-2'
+                                            checked={hideEmptyFields.availability}
+                                            onChange={() => setHideEmptyFields({ ...hideEmptyFields, availability: !hideEmptyFields.availability })}
+                                            title="Скрий редове без възможности"
+                                        />
+                                    </th>
+                                    <th className="border-b font-medium p-4 pt-0 pb-3 cursor-pointer" >
+                                        <p className="inline-block" onClick={() => handleSort('currentMonthAssignments')}>
+                                            Участия{renderSortArrow('currentMonthAssignments')}
+                                        </p>
+                                        <input
+                                            type="checkbox" className='ml-2'
+                                            checked={hideEmptyFields.assignments}
+                                            onChange={() => setHideEmptyFields({ ...hideEmptyFields, assignments: !hideEmptyFields.assignments })}
+                                            title="Скрий редове без участия"
+                                        />
+                                    </th>
+                                    <th className="border-b font-medium p-4 pt-0 pb-3 cursor-pointer" >
+                                        <p className="inline-block" onClick={() => handleSort('lastLogin')}>
+                                            Последно влизане{renderSortArrow('lastLogin')}
+                                        </p>
+                                        <input
+                                            type="checkbox" className='ml-2'
+                                            checked={hideEmptyFields.lastLogin}
+                                            onChange={() => setHideEmptyFields({ ...hideEmptyFields, lastLogin: !hideEmptyFields.lastLogin })}
+                                            title="Скрий редове без последно влизане"
+                                        />
+                                    </th>
                                 </tr>
                             </thead>
                             <tbody>
-                                {filteredPublishers.map((allPub) => {
+                                {filteredPublishers.map((pub, i) => {
-                                    // Find the publisher in the publishers collection to access statistics
-                                    const pub = publishers.find(publisher => publisher.id === allPub.id);
-
                                     return (
-                                        <tr key={allPub.id}>
+                                        <tr key={pub.id}>
-                                            <td className="border-b p-4 pl-8" title={allPub.lastUpdate}>{allPub.firstName} {allPub.lastName}</td>
+                                            <td className="border-b p-4 pl-8" title={pub.lastUpdate}>{i + 1}. {pub.firstName} {pub.lastName}</td>
                                             {/* Display statistics if publisher is found */}
                                             {pub ? (
                                                 <>
                                                     <td className="border-b p-4">
-                                                        <span title="Възможност: часове | дни" className={`badge py-1 px-2 rounded-md text-xs ${pub.currentMonthAvailabilityHoursCount || pub.currentMonthAvailabilityDaysCount ? 'bg-teal-500 text-white' : 'bg-teal-200 text-gray-300'} hover:underline`}>
+                                                        {pub.availabilities.length > 0 ? (
-                                                            {pub.currentMonthAvailabilityDaysCount || 0} | {pub.currentMonthAvailabilityHoursCount || 0}
+                                                            <span title="Възможност: часове | дни" className={`badge py-1 px-2 rounded-md text-xs ${pub.currentMonthAvailabilityHoursCount || pub.currentMonthAvailabilityDaysCount ? 'bg-teal-500 text-white' : 'bg-teal-200 text-gray-300'} hover:underline`}>
-                                                        </span>
+                                                                {pub.currentMonthAvailabilityDaysCount} | {pub.currentMonthAvailabilityHoursCount}
+                                                            </span>
+                                                        ) : <span title="Няма възможности" className="badge py-1 px-2 rounded-md text-xs bg-gray-300 text-gray-500">0</span>}
                                                     </td>
                                                     <td className="border-b p-4">
                                                         <div className="flex items-center justify-between">
@@ -73,16 +212,15 @@ function ContactsPage({ publishers, allPublishers }) {
                                             ) : (
                                                 <>
                                                     <td className="border-b p-4">
-
                                                     </td>
                                                     <td className="border-b p-4">
                                                         <div className="flex items-center justify-between">
                                                             <div className="flex items-center">
                                                                 <span className="badge py-1 px-2 rounded-md text-xs bg-gray-300 text-gray-500" title="участия този месец">
-                                                                    {allPub.currentMonthAssignments || 0}
+                                                                    {pub.currentMonthAssignments}
                                                                 </span>
                                                                 <span className="badge py-1 px-2 rounded-md text-xs bg-gray-300 text-gray-500" title="участия миналия месец">
-                                                                    {allPub.previousMonthAssignments || 0}
+                                                                    {pub.previousMonthAssignments}
                                                                 </span>
                                                             </div>
                                                         </div>
@@ -106,132 +244,16 @@ function ContactsPage({ publishers, allPublishers }) {
 export default ContactsPage;
 
 
-// Helper functions ToDo: move them to common and replace all implementations with the common ones
-function countAssignments(assignments, startTime, endTime) {
-    return assignments.filter(assignment =>
-        assignment.shift.startTime >= startTime && assignment.shift.startTime <= endTime
-    ).length;
-}
-
-function convertShiftDates(assignments) {
-    assignments.forEach(assignment => {
-        if (assignment.shift && assignment.shift.startTime) {
-            assignment.shift.startTime = new Date(assignment.shift.startTime).toISOString();
-            assignment.shift.endTime = new Date(assignment.shift.endTime).toISOString();
-        }
-    });
-}
 
 export const getServerSideProps = async (context) => {
-
+    const allPublishers = await data.getAllPublishersWithStatistics(new Date());
-    const prisma = common.getPrismaClient();
+    //merge first and last name
-    const dateStr = new Date().toISOString().split('T')[0];
-
-    let publishers = await data.filterPublishersNew('id,firstName,lastName,email,isActive,desiredShiftsPerMonth,lastLogin', dateStr, false, true, true, true, true);
-
-    // 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`);
-
-    // api/index?action=filterPublishers&assignments=true&availabilities=true&date=2024-03-14&select=id%2CfirstName%2ClastName%2CisActive%2CdesiredShiftsPerMonth
-    publishers.forEach(publisher => {
-        publisher.desiredShiftsPerMonth = publisher.desiredShiftsPerMonth || 0;
-        publisher.assignments = publisher.assignments || [];
-        publisher.availabilities = publisher.availabilities || [];
-        publisher.lastUpdate = publisher.availabilities.reduce((acc, curr) => curr.dateOfEntry > acc ? curr.dateOfEntry : acc, null);
-        if (publisher.lastUpdate) {
-            publisher.lastUpdate = common.getDateFormated(publisher.lastUpdate);
-        }
-        else {
-            publisher.lastUpdate = "Няма данни";
-        }
-        //serialize dates in publisher.assignments and publisher.availabilities
-        publisher.assignments.forEach(assignment => {
-            if (assignment.shift && assignment.shift.startTime) {
-                assignment.shift.startTime = assignment.shift.startTime.toISOString();
-                assignment.shift.endTime = assignment.shift.endTime.toISOString();
-            }
-        });
-        publisher.availabilities.forEach(availability => {
-            if (availability.startTime) {
-                availability.startTime = availability.startTime.toISOString();
-                availability.endTime = availability.endTime.toISOString();
-                if (availability.dateOfEntry) {
-                    availability.dateOfEntry = availability.dateOfEntry.toISOString();
-                }
-            }
-        });
-        publisher.lastLogin = publisher.lastLogin ? publisher.lastLogin.toISOString() : null;
-        //remove availabilities that isFromPreviousAssignment
-        publisher.availabilities = publisher.availabilities.filter(availability => !availability.isFromPreviousAssignment);
-
-
-    });
-    //remove publishers without availabilities
-    publishers = publishers.filter(publisher => publisher.availabilities.length > 0);
-
-    let allPublishers = await prisma.publisher.findMany({
-        select: {
-            id: true,
-            firstName: true,
-            lastName: true,
-            email: true,
-            phone: true,
-            isActive: true,
-            desiredShiftsPerMonth: true,
-            lastLogin: true,
-            assignments: {
-                select: {
-                    id: true,
-                    shift: {
-                        select: {
-                            startTime: true,
-                            endTime: true,
-                        },
-                    },
-                },
-            },
-        },
-    });
-
-
-
-
-    let monthInfo,
-        currentMonthStart, currentMonthEnd,
-        previousMonthStart, previousMonthEnd;
-
-    monthInfo = common.getMonthDatesInfo(new Date());
-    currentMonthStart = monthInfo.firstMonday;
-    currentMonthEnd = monthInfo.lastSunday;
-    let prevMnt = new Date();
-    prevMnt.setMonth(prevMnt.getMonth() - 1);
-    monthInfo = common.getMonthDatesInfo(prevMnt);
-    previousMonthStart = monthInfo.firstMonday;
-    previousMonthEnd = monthInfo.lastSunday;
-
-
     allPublishers.forEach(publisher => {
-        // Use helper functions to calculate and assign assignment counts
+        publisher.name = `${publisher.firstName} ${publisher.lastName}`;
-        publisher.currentMonthAssignments = countAssignments(publisher.assignments, currentMonthStart, currentMonthEnd);
-        publisher.previousMonthAssignments = countAssignments(publisher.assignments, previousMonthStart, previousMonthEnd);
-
-        publisher.lastLogin = publisher.lastLogin ? publisher.lastLogin.toISOString() : null;
-        // Convert date formats within the same iteration
-        convertShiftDates(publisher.assignments);
     });
-
-    // Optionally, if you need a transformed list or additional properties, map the publishers
-    allPublishers = allPublishers.map(publisher => ({
-        ...publisher,
-        // Potentially add more computed properties or transformations here if needed
-    }));
-    allPublishers.sort((a, b) => a.firstName.localeCompare(b.firstName) || a.lastName.localeCompare(b.lastName));
-
-
     return {
         props: {
-            publishers,
+            allPublishers
-            allPublishers,
         },
     };
 };

pages/cart/reports/coverMe.tsx

@@ -25,7 +25,17 @@ export default function EventLogList() {
     useEffect(() => {
         const fetchLocations = async () => {
             try {
-                const { data: eventLogsData } = await axiosInstance.get(`/api/data/prisma/eventLog?where={"type":"${EventLogType.AssignmentReplacementAccepted}"}&include={"publisher":{"select":{"firstName":true,"lastName":true}},"shift":{"include":{"assignments":{"include":{"publisher":{"select":{"firstName":true,"lastName":true}}}}}}}`);
+                const { data: eventLogsDataold } = await axiosInstance.get(`/api/data/prisma/eventLog?where={"type":"${EventLogType.AssignmentReplacementAccepted}"}&include={"publisher":{"select":{"firstName":true,"lastName":true}},"shift":{"include":{"assignments":{"include":{"publisher":{"select":{"firstName":true,"lastName":true}}}}}}}`);
+
+                // const where = encodeURIComponent(`{OR: [{type: "${EventLogType.AssignmentReplacementAccepted}"}, {type: "${EventLogType.AssignmentReplacementManual}"}]}`);
+                const where = encodeURIComponent(JSON.stringify({
+                    OR: [
+                        { type: EventLogType.AssignmentReplacementAccepted },
+                        { type: EventLogType.AssignmentReplacementManual }
+                    ]
+                }));
+
+                const { data: eventLogsData } = await axiosInstance.get(`/api/data/prisma/eventLog?where=${where}&include={"publisher":{"select":{"firstName":true,"lastName":true}},"shift":{"include":{"assignments":{"include":{"publisher":{"select":{"firstName":true,"lastName":true}}}}}}}`);
 
                 setEventLog(eventLogsData);
 
@@ -40,6 +50,9 @@ export default function EventLogList() {
             fetchLocations();
         }
     }, []);
+
+
+
     return (
         <Layout>
             <ProtectedRoute allowedRoles={[UserRole.POWERUSER, UserRole.ADMIN]}>
@@ -67,15 +80,18 @@ export default function EventLogList() {
                             <table className="w-full table-auto">
                                 <thead>
                                     <tr>
+                                        <th className="px-4 py-2 text-left">На</th>
                                         <th className="px-4 py-2 text-left">От</th>
                                         <th className="px-4 py-2 text-left">Дата</th>
                                         <th className="px-4 py-2 text-left">Смяна</th>
-                                        <th className="px-4 py-2 text-left">Действия</th>
+                                        <th className="px-4 py-2 text-left">Събитие</th>
+                                        {/* <th className="px-4 py-2 text-left">Действия</th> */}
                                     </tr>
                                 </thead>
                                 <tbody>
                                     {!showOpenRequests && (eventLogs.map((event) => (
                                         <tr key={event.id}>
+                                            <td className="border px-2 py-2">{new Date(event.date).toLocaleString('bg')}</td>
                                             <td className="border px-2 py-2">{event.publisher.firstName + " " + event.publisher.lastName}</td>
                                             <td className="border px-2 py-2">{new Date(event.shift?.startTime).toLocaleString('bg')}</td>
                                             <td className="border px-2 py-2">
@@ -86,17 +102,18 @@ export default function EventLogList() {
                                             <td className="border px-2 py-2">
                                                 {event.content}
                                             </td>
-                                            <td className="border px-4 py-2">
+                                            {/* <td className="border px-4 py-2">
                                                 <button
                                                     className="bg-red-500 hover:bg-red-700 text-white font-bold py-2 px-4 rounded">
                                                     Изтрий
                                                 </button>
-                                            </td>
+                                            </td> */}
                                         </tr>
                                     ))
                                     )}
                                     {showOpenRequests && (requestedAssignments.map((assignment) => (
                                         <tr key={assignment.id}>
+                                            <td className="border px-2 py-2">{new Date(assignment.date).toLocaleString('bg')}</td>
                                             <td className="border px-2 py-2">{assignment.publisher.firstName + " " + assignment.publisher.lastName}</td>
                                             <td className="border px-2 py-2">{new Date(assignment.shift.startTime).toLocaleString('bg')}</td>
                                             <td className="border px-2 py-2">
@@ -104,12 +121,13 @@ export default function EventLogList() {
                                                     <div key={ass.id}>{ass.publisher.firstName + " " + ass.publisher.lastName}</div>
                                                 ))}
                                             </td>
-                                            <td className="border px-4 py-2">
+                                            {/* <td className="border px-4 py-2">
                                                 <button
-                                                    className="bg-red-500 hover:bg-red-700 text-white font-bold py-2 px-4 rounded">
+                                                    className="bg-red-500 hover:bg-red-700 text-white font-bold py-2 px-4 rounded"
+                                                >
                                                     Изтрий
                                                 </button>
-                                            </td>
+                                            </td> */}
                                         </tr>
                                     ))
                                     )}

prisma/migrations/20240511112711_aded_enum_options/migration.sql

@@ -1,5 +1,5 @@
 -- AlterTable
-ALTER TABLE `eventlog`
+ALTER TABLE `EventLog`
 MODIFY `type` ENUM(
     'AssignmentReplacementManual', 'AssignmentReplacementRequested', 'AssignmentReplacementAccepted', 'SentEmail', 'PasswordResetRequested', 'PasswordResetEmailConfirmed', 'PasswordResetCompleted'
 ) NOT NULL;

src/helpers/data.js

@@ -420,7 +420,8 @@ async function filterPublishersNew(selectFields, filterDate, isExactTime = false
         if (isWithStats) {
             pub.currentMonthAvailability = pub.availabilities?.filter(avail => {
                 // return avail.dayOfMonth != null && avail.startTime >= currentMonthStart && avail.startTime <= monthInfo.lastSunday;
-                return avail.startTime >= monthInfo.firstMonday && (noEndDateFilter || avail.startTime <= monthInfo.lastSunday);
+                return (avail.startTime >= monthInfo.firstMonday && (noEndDateFilter || avail.startTime <= monthInfo.lastSunday))
+                    || (avail.dayOfMonth == null); // include repeating availabilities
             })
             pub.currentMonthAvailabilityDaysCount = pub.currentMonthAvailability.length;
             // pub.currentMonthAvailabilityDaysCount += pub.availabilities.filter(avail => {
@@ -472,13 +473,13 @@ async function filterPublishersNew(selectFields, filterDate, isExactTime = false
 }
 
 //ToDo: refactor this function 
-async function getAllPublishersWithStatistics(filterDate) {
+async function getAllPublishersWithStatistics(filterDate, noEndDateFilter = false) {
 
     const prisma = common.getPrismaClient();
     const monthInfo = common.getMonthDatesInfo(new Date(filterDate));
     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 { data: publishers } = await axios.get(`api/?action=filterPublishers&assignments=true&availabilities=true&date=${dateStr}&select=id,firstName,lastName,isActive,desiredShiftsPerMonth`);
@@ -557,6 +558,14 @@ async function getAllPublishersWithStatistics(filterDate) {
 
             },
         },
+        orderBy: [
+            {
+                firstName: 'asc', // or 'desc' if you want descending order
+            },
+            {
+                lastName: 'asc', // or 'desc' if you want descending order
+            }
+        ],
     });
 
 
@@ -577,6 +586,11 @@ async function getAllPublishersWithStatistics(filterDate) {
         // common.convertDatesToISOStrings(publisher.availabilities); //ToDo fix the function to work with this sctucture and use it
     });
 
+    //debug
+    const pubsWithAvailabilities = allPublishers.filter(publisher => publisher.availabilities.length > 0);
+    const pubsWithAvailabilities2 = publishers.filter(publisher => publisher.currentMonthAvailabilityHoursCount > 0);
+    console.log(`publishers: ${allPublishers.length}, publishers with availabilities: ${pubsWithAvailabilities.length}, publishers with availabilities2: ${pubsWithAvailabilities2.length}`);
+
 
     //merge allPublishers with publishers
     allPublishers = allPublishers.map(pub => {

styles/styles.css

@@ -37,12 +37,30 @@ iframe {
   filter: invert(1);
 }
 
+.modal-container {
+  display: flex;
+  flex-direction: column-reverse; /* Newest first if new elements are prepended */
+}
 .modal-content {
-  z-index: 1002; /* or a higher value if necessary */
+  /* z-index: 1002; or a higher value if necessary */
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%); /* Center the modal */
+  z-index: 1051; /* Higher z-index than overlay */
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 8px;
+  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  
+  z-index: 1051; /* High z-index */
 }
 
 .modal-overlay {
-  z-index: 1001;
+  position: fixed;
+  inset: 0;
+  background-color: rgba(0, 0, 0, 0.5); /* Semi-transparent background */
+  z-index: 1050; /* High z-index */
 }
 .publisher {
   position: relative;