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

assignment - search for replacement works

Browse Source
This commit is contained in:
Dobromir Popov
2024-03-03 04:21:14 +02:00
parent bd9d345386
commit 87836fab0a
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/calendar/avcalendar.tsx
View File

@ -270,7 +270,8 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
let bgColorClass = 'bg-gray-500'; // Default color for inactive events let bgColorClass = 'bg-gray-500'; // Default color for inactive events
var bgColor = event.isactive ? "" : "bg-gray-500"; var bgColor = event.isactive ? "" : "bg-gray-500";
if (event.type === "assignment") { if (event.type === "assignment") {
bgColor = event.isConfirmed ? "bg-green-500" : "bg-yellow-500"; bgColor = event.isTentative ? "bg-red-500" : (event.isConfirmed ? "bg-green-500" : "bg-yellow-500");
//event.title = event.publisher.name; //ToDo: add other publishers names //event.title = event.publisher.name; //ToDo: add other publishers names
//event.title = common.getTimeFomatted(event.startTime) + " - " + common.getTimeFomatted(event.endTime); //event.title = common.getTimeFomatted(event.startTime) + " - " + common.getTimeFomatted(event.endTime);
} else { } else {
@ -313,12 +314,24 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
toast.info("Потвърдено!", { autoClose: 2000 }); toast.info("Потвърдено!", { autoClose: 2000 });
// Update the event data // Update the event data
event.isConfirmed = true; event.isConfirmed = true;
event.isactive = false; event.isTentative = false;
// Update the events array by first removing the old event and then adding the updated one // Update the events array by first removing the old event and then adding the updated one
setEvents(currentEvents => { setEvents(currentEvents => {
const filteredEvents = currentEvents.filter(e => e.id !== event.id); const filteredEvents = currentEvents.filter(e => e.id !== event.id);
return [...filteredEvents, event]; return [...filteredEvents, event];
}); });
//store the updated event in the database
var assignment = {
isConfirmed: true,
isTentative: false
};
axiosInstance.put('/api/data/assignments/' + event.id, assignment)
.then((response) => {
console.log(response);
})
.catch((error) => {
console.log(error);
});
}; };
return ( return (
<div style={eventStyle} className={bgColor + " relative"} <div style={eventStyle} className={bgColor + " relative"}

5
components/publisher/ShiftsList.tsx
View File

@ -33,8 +33,9 @@ const ShiftsList = ({ assignments, selectedtab }: ShiftsListProps) => {
const searchReplacement = async (id) => { const searchReplacement = async (id) => {
try { try {
var assignment = (await axiosInstance.get("/api/data/ssignments/" + id)).data; var assignment = (await axiosInstance.get("/api/data/assignments/" + id)).data;
assignment.isConfirmed = true; assignment.isConfirmed = false;
assignment.isTentative = true;
// assignment.isDeleted = true; // assignment.isDeleted = true;
await axiosInstance.put("/api/data/assignments/" + id, assignment); await axiosInstance.put("/api/data/assignments/" + id, assignment);
toast.success("Shift Tentative", { toast.success("Shift Tentative", {