Merge branch 'development' into 'task-53-fix/put_task_repair'

# Conflicts:
#   planner-front/src/store/actions/tasksActions.js

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

 import { Grid } from "@mui/material";
-import { memo, useMemo } from "react";
+import { memo, useEffect, useMemo, useState } from "react";
 import CalendarStandartCell from "../CalendarStandartCell.js/CalendarStandartCell";
 import CalendarTask from "../CalendarTask/CalendarTask";
+import EmptyBox from "./EmptyBox/EmptyBox";
 
-const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, handleOpen, modal, setCurrentTask, year, month, tasks, day, hourFormat}) => {
+const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, handleOpen, modal, setCurrentTask, year, month, tasks, day, hourFormat, setCurrentLine, currentLine, dragTaskHandler}) => {
 
   const hours = useMemo(()=>{ 
     return hoursInDay.map((hour)=>parseInt(hour.split(':')[0]))},
@@ -25,8 +26,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
@@ -44,6 +45,7 @@ const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, h
       hourDiff = 2
       hourDiffEnd = 1
     }
+    
     if (availableTasks.length) {
       lines.push(hoursInDay.map((hour)=>parseInt(hour.split(':')[0])))
       for (let k = 0; k < sortedTasks.length; k++) {
@@ -73,11 +75,15 @@ const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, h
                     }
                   }
                   if (!havePlace) {
+                    if (j + 1 === lines.length) {
+                      lines.push(hoursInDay.map((hour)=>parseInt(hour.split(':')[0])))
+                    }
                     havePlace = true  
                     break;
                   }
                   line[i] += `-${k}`
-                  if ((task.infoForCell.endMinute === 59 && task.infoForCell.endHour === hour + hourDiffEnd) || (!hourFormat && task.infoForCell.endMinute === 59 && task.infoForCell.endHour === hour)) {
+                  if ((task.infoForCell.endMinute === 59 && task.infoForCell.endHour === hour + hourDiffEnd) 
+                  || (!hourFormat && task.infoForCell.endMinute === 59 && task.infoForCell.endHour === hour)) {
                     skipLine = true
                     break;
                   }
@@ -101,11 +107,11 @@ const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, h
       const boxes = []
       for (let i = 0; i < line.length; i++) {
         if (!isNaN(line[i])) {
-          if (boxes[boxes.length -1]?.task === null) {
-            boxes[boxes.length -1].xs += xs
-          } else {
-            boxes.push({xs: xs, task: null})
-          }
+          // if (boxes[boxes.length -1]?.task === null) {
+          //   boxes[boxes.length -1].xs += xs
+          // } else {
+          boxes.push({xs: xs, task: null, hour: line[i]})
+          //  }
         } else {
           const task = sortedTasks[line[i].split('-')[1]]
           const taskIsThere = boxes.find((taskFind)=>{
@@ -114,7 +120,9 @@ const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, h
           if (taskIsThere) {
             taskIsThere.xs +=xs
           } else {
-            boxes.push({xs: xs, task: sortedTasks[line[i].split('-')[1]]})
+            boxes.push({
+              xs: xs, 
+              task: sortedTasks[line[i].split('-')[1]]})
           }
         }
       }
@@ -129,13 +137,16 @@ const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, h
         xs={10.8}
         align='center'
         >
+          
           {hoursInDay.map((hour, i)=>{
             return (
               <CalendarStandartCell
+                  linesInDay={linesInDay}
                   key={i} 
                   item xs={xs}
                   createTaskInCellHandler={createTaskInCellHandler}
                   hours={hour}
+                  dragTaskHandler={dragTaskHandler}
                   dayNumber={day.dayNumber}
                   currentTask={currentTask}
                   handleOpen={handleOpen}
@@ -148,26 +159,62 @@ const CalendarRowDay = ({xs, hoursInDay, createTaskInCellHandler, currentTask, h
             {linesInDay?.map((line, i)=>{
               const boxes = getBoxesInLine(line)
               return(
-              <Grid key={i} container sx={{height: '35px', backgroundColor: 'rgb(0,0,0,0)', marginTop: i === 0 ? '-35px' : 0, marginBottom: '5px'}}>
-                {boxes.map((box)=>{
+              <Grid key={i} container sx={{height: '35px', backgroundColor: 'rgb(0,0,0,0)', marginBottom: '5px'}}>
+                {boxes.map((box, index)=>{
                   if (box.task) {
-                    return (<Grid item xs={box.xs} sx={{height: '35px', marginBottom: '5px'}}>
+                    return (<Grid 
+                        key={i}
+                        item xs={box.xs} 
+                        sx={{height: '35px', marginBottom: '5px'}}
+                        >
                       <CalendarTask
+                       dragTaskHandler={dragTaskHandler}
+                       setCurrentLine={()=>{setCurrentLine(day.dayNumber)}} 
+                       currentTask={currentTask}
+                       currentLine={currentLine}
+                       hour={parseInt(hours[index])}
+                       line={day.dayNumber}
                        task={box.task}
                        setCurrentTask={setCurrentTask} 
                        handleOpen={handleOpen}
                        />
                     </Grid>)
                   } else {
-                    return (<Grid item xs={box.xs} sx={{height: '35px', backgroundColor: 'rgb(0,0,0,0)'}}>
-                      
-                    </Grid>)
+                    return (<EmptyBox 
+                      key={i}
+                      modal={modal}
+                      dayNumber={day.dayNumber}
+                      hourNumber={box.hour}
+                      handleOpen={handleOpen}
+                      dragTaskHandler={dragTaskHandler}
+                      createTaskInCellHandler={createTaskInCellHandler}
+                      xs={box.xs}
+                      >
+                      </EmptyBox>)
                   }
                 })}
               </Grid>)
             })}
+
+            <Grid container sx={{height: '35px', backgroundColor: 'rgb(0,0,0,0)', marginBottom: '5px'}}>
+              {hoursInDay.map((hour, i)=>{
+                const hourNumber = parseInt(hour)
+                return(<EmptyBox 
+                  key={i}
+                  modal={modal}
+                  dayNumber={day.dayNumber}
+                  hourNumber={hourNumber}
+                  handleOpen={handleOpen}
+                  dragTaskHandler={dragTaskHandler}
+                  createTaskInCellHandler={createTaskInCellHandler}
+                  xs={xs}
+                  >
+                  </EmptyBox>)
+              })}
+            </Grid>
         </Grid>
     </>
 };
 
 export default memo(CalendarRowDay);
+

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

+import { Grid} from "@mui/material";
+import React, { memo, useEffect, useState} from "react";
+import DefaultTask from "../../DefaultTask/DefaultTask";
+
+
+
+const EmptyBox = ({hourNumber, handleOpen, dayNumber, xs, dragTaskHandler, modal, createTaskInCellHandler}) => {
+
+  const [isThisCell, setIsThisCell] = useState(false)
+  useEffect(()=>{
+      if(!modal) {
+          setIsThisCell(false);
+      }
+  }, [modal])
+
+  const onClickHandler = (e, dayNumber, hour) => {
+    createTaskInCellHandler(dayNumber, hour);
+    setIsThisCell(true);
+    handleOpen(e)
+  } 
+  const dragOverHandler = (e) => {
+    e.preventDefault();
+  }
+
+  const dropHandler = (e) => {
+    e.stopPropagation()
+    e.preventDefault();
+    dragTaskHandler(dayNumber, hourNumber)
+  }
+
+  return(<Grid 
+    onDragOver={(e)=>{dragOverHandler(e)}}
+    onDrop={(e)=>{dropHandler(e)}}
+    onClick={(e)=>{onClickHandler(e, dayNumber, hourNumber)}}
+    item xs={xs} sx={{height: '35px', backgroundColor: 'rgb(0,0,0,0)'}}>
+      {isThisCell ?  
+        <DefaultTask/> : null}
+    </Grid>)
+};
+
+export default memo(EmptyBox, (prevProps, nextProps)=>{
+  if(!prevProps.modal) return false
+  if(nextProps.modal) return true
+});
\ No newline at end of file

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

 import { Grid} from "@mui/material";
 import { memo, useEffect, useState } from "react";
 
-const CalendarStandartCell = ({children, xs, hours, dayNumber,  createTaskInCellHandler, handleOpen, modal, divRef }) => {
+const CalendarStandartCell = ({children, xs, hours, dayNumber,  createTaskInCellHandler, handleOpen, modal, divRef, dragTaskHandler, linesInDay}) => {
     const [isThisCell, setIsThisCell] = useState(false)
     useEffect(()=>{
         if(!modal) {
@@ -9,11 +9,23 @@ const CalendarStandartCell = ({children, xs, hours, dayNumber,  createTaskInCell
         }
     }, [modal])
 
+    const dragOverHandler = (e) => {
+        e.preventDefault();
+      }
+    
+    const dropHandler = (e) => {
+        e.stopPropagation()
+        e.preventDefault();
+        dragTaskHandler(dayNumber, parseInt(hours.split(':')[0]))
+    }
+
     return <>
         <Grid  
             item xs={xs} 
-            sx={{position: 'relative', height: '35px'}} 
+            sx={{position: 'relative', height:  linesInDay?.length ? `${35*linesInDay}px` : '35px'}} 
             onClick={(e)=>{createTaskInCellHandler(dayNumber, hours); setIsThisCell(true); handleOpen(e)}}
+            onDragOver={(e)=>{dragOverHandler(e)}}
+            onDrop={(e)=>{dropHandler(e)}}
         >
             {children}
         {isThisCell ?  

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

 import { Grid} from "@mui/material";
-import React, { memo} from "react";
+import React, { memo, useEffect, useState} from "react";
 
 
 
-const CalendarTask = ({setCurrentTask, handleOpen, task}) => {
+const CalendarTask = ({setCurrentTask, handleOpen, task, line, setCurrentLine, currentLine, currentTask,  dragTaskHandler, hour}) => {
+
+  const [color, setColor] = useState('')
+  useEffect(() => {
+    if (task.priority) {
+      if (task.priority === 'A') setColor('rgb(32, 138, 250)')
+      if (task.priority === 'B') setColor('lightgreen')
+      if (task.priority === 'C') setColor('yellow')
+    } else {
+      setColor('rgb(171, 157, 157);')
+    }
+  }, [task])
 
 
   const onClickTaskHandler = (e, task) => {
@@ -12,9 +23,25 @@ const CalendarTask = ({setCurrentTask, handleOpen, task}) => {
     handleOpen(e)
   }
 
+  const dragLeaveHandler = (e) => {
+    e.target.style.boxShadow = 'none'
+  }
+  const dragStartHandler = (e, line, task) => {
+    setCurrentLine()
+    setCurrentTask(task); 
+  }
+  const dragEndHandler = (e) => {
+    e.target.style.boxShadow = 'none'
+  }
+  
   return (<>
     <Grid  
-          sx={{ position: 'relative', height: '30px', backgroundColor: 'lightgreen', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', borderRadius: '10px', margin: '5px 10px', display: 'flex', justifyContent: 'flex-start', alignItems: 'center', paddingLeft: '5px', zIndex: '5'}} 
+        draggable={true} 
+
+        onDragLeave={(e)=>{dragLeaveHandler(e)}}
+        onDragStart={(e)=>{dragStartHandler(e, line, task)}}
+        onDragEnd={(e)=>{dragEndHandler(e)}}
+        sx={{ position: 'relative', height: '30px', backgroundColor: color, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', borderRadius: '10px', margin: '5px 10px', display: 'flex', justifyContent: 'flex-start', alignItems: 'center', paddingLeft: '5px', zIndex: '5'}} 
         onClick={(e)=>{onClickTaskHandler(e, task)}}
       >
       <span>

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

+import { Box } from "@mui/material";
+import { memo } from "react";
+
+const DefaultTask = ({}) => {
+
+  
+  return (<>
+    <Box  
+        sx={{ position: 'relative', height: '30px', backgroundColor: 'lightgreen', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', borderRadius: '10px', margin: '5px 10px', display: 'flex', justifyContent: 'flex-start', alignItems: 'center', paddingLeft: '5px', zIndex: '5'}} 
+      >
+      <span>
+        Задача
+      </span>
+    </Box>
+  </>)
+};
+
+export default memo(DefaultTask);
\ No newline at end of file

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

 import { FormControlLabel, Switch} from "@mui/material";
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import CalendarRow from "./CalendarRow/CalendarRow";
 import CalendarSmallCell from "./CalendarSmallCell/CalendarSmallCell";
 import CalendarStandartCell from "./CalendarStandartCell.js/CalendarStandartCell";
@@ -7,33 +7,39 @@ import ModalTask from "../UI/ModalTask/ModalTask";
 import MonthCalendarModalContent from "../MonthCalendarModalContent/MonthCalendarModalContent";
 import CalendarRowDay from "./CalendarRowDay/CalendarRowDay";
 
-function MonthCalendarBody({month, year, tasks, createTaskInCellHandler, currentTask, setCurrentTask, hourFormat, setHourFormat, onChangeCurrentTaskHandler, sendNewTaskHandler, deleteTaskHandler, cellSizes, hoursInDay, daysInMonth}) {
 
+function MonthCalendarBody({month, year, tasks, createTaskInCellHandler, currentTask, setCurrentTask, hourFormat, setHourFormat, onChangeCurrentTaskHandler, sendNewTaskHandler, deleteTaskHandler, cellSizes, hoursInDay, daysInMonth, dragTaskHandler}) {
+
+  const [currentLine, setCurrentLine] = useState('')
   const [modal, setModal] = useState({open:false, y: 0, x: 0,});
   const handleOpen = (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,
       xDiv: e.target.offsetWidth,
     })
   };
+
   const handleClose = () => {
     setModal({...modal, open: false})
     setCurrentTask({})
   };
+
   const divRef = useRef(null)
   const [divHeight, setDivHeight] = useState('')
+
   useEffect(() => {
     if (divRef) {
         setDivHeight(()=>{
           return divRef.current?.offsetHeight
         })
       }
-}, [divRef.current?.offsetHeight, hourFormat, month, tasks]);
+  }, [divRef.current?.offsetHeight, hourFormat, month, tasks]);
+  
 
   return (
     <div ref={divRef} style={{marginBottom: '30px'}}>
@@ -62,11 +68,14 @@ function MonthCalendarBody({month, year, tasks, createTaskInCellHandler, current
               <CalendarSmallCell xs={cellSizes.smallCell}>{day.dayNumber}</CalendarSmallCell>
               <CalendarSmallCell xs={cellSizes.smallCell}>{day.dayOfWeek}</CalendarSmallCell>
                 <CalendarRowDay
+                dragTaskHandler={dragTaskHandler}
                 xs={cellSizes.dayCell}
                 createTaskInCellHandler={createTaskInCellHandler}
                 hoursInDay={hoursInDay}
                 currentTask={currentTask}
                 handleOpen={handleOpen}
+                currentLine={currentLine}
+                setCurrentLine={setCurrentLine}
                 modal={modal.open}
                 setCurrentTask={setCurrentTask}
                 year={year}
@@ -74,7 +83,8 @@ function MonthCalendarBody({month, year, tasks, createTaskInCellHandler, current
                 tasks={tasks}
                 day={day}
                 hourFormat={hourFormat}
-            />
+              >
+              </CalendarRowDay>
           </CalendarRow>
         )
       })}

planner-front/src/containers/MonthCalendar/MonthCalendar.js

@@ -101,8 +101,14 @@ function MonthCalendar() {
     const iso = dateLocal.toISOString();
     return iso;
   }
+
   const createTaskInCellHandler = (dayNumber, dayHour) => {
-    const hour = parseInt(dayHour.split(':')[0])
+    let hour
+    if (!isNaN(dayHour)) {
+      hour = dayHour
+    } else {
+      hour = parseInt(dayHour.split(':')[0])
+    }
     let hourDue
     if (hourFormat) {
       hourDue = hour + 0
@@ -119,10 +125,25 @@ function MonthCalendar() {
     setCurrentTask((newTask))
   }
   
+  const dragTaskHandler = async (dayNumber, hour) => {
+    const timeEnd = currentTask.dateTimeDue.split('T')[1]
+    const timeEndHour = parseInt(timeEnd.split(':')[0])
+    const timeStart = currentTask.dateTimeStart.split('T')[1]
+    const timeStartHour = parseInt(timeStart.split(':')[0])
+    const hourDiff = timeEndHour - timeStartHour
+    const due = dateToISOLikeButLocal(new Date(dateNow.year, dateNow.month, dayNumber, hour + hourDiff, 59))
+    const start = dateToISOLikeButLocal(new Date(dateNow.year, dateNow.month, dayNumber, hour, 0))
+    await dispatch(editTask({
+      ...currentTask,
+      dateTimeStart: start,
+      dateTimeDue: due
+    }))
+    setCurrentTask({})
+  }
+
   const sendNewTaskHandler = async () => {
     if (currentTask.id) {
       delete currentTask.infoForCell
-      console.log(currentTask)
       setCurrentTask(() => {
         return{
         ...currentTask,
@@ -171,6 +192,7 @@ function MonthCalendar() {
         cellSizes={cellSizes}
         hoursInDay={hoursInDay}
         daysInMonth={daysInMonth}
+        dragTaskHandler={dragTaskHandler}
       />
 
     </>

planner-front/src/store/actions/tasksActions.js

@@ -118,9 +118,8 @@ const editTaskFailure = (error) => {
 export const editTask = (task) => {
   return async (dispatch, getState) => {
       dispatch(editTaskRequest());
-      // const token = getState().users?.user?.token;
       try {
-        await axios.put("/tasks/", task);
+        await axios.put("/tasks", task);
         dispatch(editTaskSuccess())
         dispatch(fetchAllTasks())
         dispatch(fetchCalendarTasks())