#56 Пофиксил разные баги с драг энд дроп и модальным окном

planner-front/src/components/MonthCalendarBody/CalendarRowDay/CalendarRowDay.js

@@ -25,8 +25,8 @@ const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, h
   const sortedTasks = useMemo(() => {
     if (availableTasks.length) {
       const newSortedArr = [...availableTasks].sort(function(a,b){
-        const durattionFirstDate = new Date(a.dateTimeDue).getTime() - new Date(a.dateTimeStart).getTime()
-        const durattionSecondDate = new Date(b.dateTimeDue).getTime() - new Date(b.dateTimeStart).getTime()
+        const durattionFirstDate = a.infoForCell.endHour - a.infoForCell.startHour
+        const durattionSecondDate = b.infoForCell.endHour - b.infoForCell.startHour
         return durattionSecondDate - durattionFirstDate;
       })
       return newSortedArr
@@ -104,7 +104,7 @@ const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, h
           // if (boxes[boxes.length -1]?.task === null) {
           //   boxes[boxes.length -1].xs += xs
           // } else {
-          boxes.push({xs: xs, task: null})
+          boxes.push({xs: xs, task: null, hour: line[i]})
           //  }
         } else {
           const task = sortedTasks[line[i].split('-')[1]]
@@ -131,8 +131,6 @@ const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, h
       e.preventDefault();
       dragTaskHandler(day.dayNumber, currentHour)
   }
-  console.log(sortedTasks)
-  console.log(linesInDay)
 
   return <>
       <Grid 
@@ -187,7 +185,7 @@ const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, h
                   } else {
                     return (<Grid 
                     onDragOver={(e)=>{dragOverHandler(e)}}
-                    onDrop={(e)=>{dropHandler(e, parseInt(hours[index]))}}
+                    onDrop={(e)=>{dropHandler(e, box.hour)}}
                     item xs={box.xs} sx={{height: '35px', backgroundColor: 'rgb(0,0,0,0)'}}>
                       
                     </Grid>)

planner-front/src/components/MonthCalendarBody/MonthCalendarBody.js

@@ -13,10 +13,11 @@ function MonthCalendarBody({month, year, tasks, createTaskInCellHandler, current
   const [currentLine, setCurrentLine] = useState('')
   const [modal, setModal] = useState({open:false, y: 0, x: 0,});
   const handleOpen = (e) => {
+    console.log(e)
     setModal( {
       open: true, 
-      yPage: e.pageY, 
-      xPage: e.pageX, 
+      yPage: e.clientY, 
+      xPage: e.clientX, 
       yDivClick: e.nativeEvent.offsetY,
       xDivClick: e.nativeEvent.offsetX,
       yDiv: e.target.offsetHeight,
@@ -40,6 +41,7 @@ function MonthCalendarBody({month, year, tasks, createTaskInCellHandler, current
       }
   }, [divRef.current?.offsetHeight, hourFormat, month, tasks]);
   
+
   return (
     <div ref={divRef} style={{marginBottom: '30px'}}>
     <CalendarRow