From 9dd43fbc3430ce3f5f23db51b8aee469d038277e Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Tue, 28 May 2024 20:12:15 +0300
Subject: [PATCH 1/4] don't close on assignment add

---
 pages/cart/calendar/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/cart/calendar/index.tsx b/pages/cart/calendar/index.tsx
index 461c88d..1043a70 100644
--- a/pages/cart/calendar/index.tsx
+++ b/pages/cart/calendar/index.tsx
@@ -940,7 +940,7 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
                                             {common.getTimeRange(shift.startTime, shift.endTime)} {shift.id}
 
                                             {!assignmentExists && shift.isAvailable && (
-                                                <button onClick={() => { addAssignment(publisher, shift.id); onClose() }}
+                                                <button onClick={() => { addAssignment(publisher, shift.id); }}
                                                     className="mt-2 bg-green-500 text-white p-1 rounded hover:bg-green-600 active:bg-green-700 focus:outline-none"
                                                 >
                                                     добави

From 4f8d72c162fffa4973ceadcfd8f7deb1631e1fdc Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Tue, 28 May 2024 22:29:29 +0300
Subject: [PATCH 2/4] fix to filter out future repeating availbilities

---
 src/helpers/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/helpers/data.js b/src/helpers/data.js
index fb306c6..4713e0e 100644
--- a/src/helpers/data.js
+++ b/src/helpers/data.js
@@ -331,7 +331,7 @@ async function filterPublishersNew(selectFields, filterDate, isExactTime = false
                             { dayOfMonth: null },
                             //{ dayofweek: dayOfWeekEnum }, // we want all days of the week for now
                             // moved down to conditional filters
-                            // { startTime: { lte: filterTimeTo } }, // we ignore startTime as it will be filtered later only by the time and not by date. 
+                            { startTime: { lte: filterTimeTo } }, // we ignore startTime as it will be filtered later only by the time and not by date. ! but we need it to filter future repeating availabilities that are not yet started on the request date
                             {
                                 OR: [ // OR condition for repeatUntil to handle events that either end after filterDate or repeat forever
                                     { endDate: { gte: filterTimeFrom } }, // endDate included

From c8367026ddc5d33b319b349672965048b38404ce Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Wed, 29 May 2024 00:12:42 +0300
Subject: [PATCH 3/4] ui fix for shift UI

---
 components/calendar/ShiftComponent.tsx | 5 +----
 pages/cart/calendar/index.tsx          | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/calendar/ShiftComponent.tsx b/components/calendar/ShiftComponent.tsx
index d937df3..1420d97 100644
--- a/components/calendar/ShiftComponent.tsx
+++ b/components/calendar/ShiftComponent.tsx
@@ -81,13 +81,10 @@ function ShiftComponent({ shift, onShiftSelect, isSelected, onPublisherSelect, a
             const { data } = await axiosInstance.post("/api/data/assignments", newAssignment);
             // Update the 'publisher' property of the returned data with the full publisher object
             data.publisher = publisher;
-            //ToDo: see if we need to update in state
-            // publisher.currentWeekAssignments += 1;
-            // publisher.currentMonthAssignments += 1;
+            setAssignments(prevAssignments => [...prevAssignments, data]);
             if (onAssignmentChange) {
                 onAssignmentChange(data.publisher.id, 'add')
             }
-            setAssignments(prevAssignments => [...prevAssignments, data]);
         } catch (error) {
             console.error("Error adding assignment:", error);
         }
diff --git a/pages/cart/calendar/index.tsx b/pages/cart/calendar/index.tsx
index 1043a70..db1b0d1 100644
--- a/pages/cart/calendar/index.tsx
+++ b/pages/cart/calendar/index.tsx
@@ -367,6 +367,8 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
             const { data } = await axiosInstance.post("/api/data/assignments", newAssignment);
             // Update the 'publisher' property of the returned data with the full publisher object
             data.publisher = publisher;
+            data.shift = shifts.find(shift => shift.id === shiftId);
+            publisher.assignments = [...publisher.assignments, data];
             handleAssignmentChange(publisher.id, 'add');
         } catch (error) {
             console.error("Error adding assignment:", error);

From 17a56995b5f818f6cd4ec412449d7753c714caaa Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Wed, 29 May 2024 00:33:52 +0300
Subject: [PATCH 4/4] hilight publishers where desiredShiftsPerMonth not
 reached

---
 pages/cart/calendar/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/cart/calendar/index.tsx b/pages/cart/calendar/index.tsx
index db1b0d1..a94d001 100644
--- a/pages/cart/calendar/index.tsx
+++ b/pages/cart/calendar/index.tsx
@@ -786,10 +786,11 @@ export default function CalendarPage({ initialEvents, initialShifts }) {
                                         return (
                                             <li key={index}
                                                 className={`flex justify-between items-center p-4 sm:py-2 rounded-lg shadow-sm mb-2 
-                                                ${bgAndBorderColorClass} ${selectedBorderClass} ${activeOpacityClass}`}
+                                                ${bgAndBorderColorClass} ${selectedBorderClass} ${activeOpacityClass}
+                                                ${pub.currentMonthAssignments >= pub.desiredShiftsPerMonth ? 'text-gray-400' : 'text-gray-800'}`}
                                                 onDoubleClick={(handlePublisherModalOpen.bind(this, pub))}
                                             >
-                                                <span className={`text-gray-700 ${pub.isAvailableForShift ? 'font-bold' : 'font-medium'} `}>
+                                                <span className={`${pub.isAvailableForShift ? 'font-bold' : 'font-medium'} `}>
                                                     {pub.firstName} {pub.lastName}
                                                     {pub.canTransport && (<LocalShippingIcon className="mx-2 text-gray-500" />)}
                                                 </span>