diff --git a/src/KBBoard/BoardAPI.js b/src/KBBoard/BoardAPI.js index 68920de..69900dc 100644 --- a/src/KBBoard/BoardAPI.js +++ b/src/KBBoard/BoardAPI.js @@ -6,7 +6,7 @@ export const loadBoardDataAPI = async (boardId) => { export const createTaskAPI = async (taskCateg, taskTitle, taskDescription, taskDedline, memberId) => { return axios.post('/api/boards/categories/tasks/create', { - category_id: taskCateg, title: taskTitle, description: taskDescription, deadline: taskDedline, assigned_users: memberId + category_id: taskCateg, title: taskTitle, description: taskDescription, deadline: taskDedline, assigned_user: memberId }); }; diff --git a/src/KBBoard/BoardLogic.js b/src/KBBoard/BoardLogic.js index 6dd3933..fbffff0 100644 --- a/src/KBBoard/BoardLogic.js +++ b/src/KBBoard/BoardLogic.js @@ -58,14 +58,13 @@ export const useBoardLogic = (id, setError, setInfo, setCategories, setLoading, } }, [id, loadBoardData, setLoading, setError]); - const createTask = useCallback(async (taskCategori, taskTitle, taskDescription, modalCrTask) => { + const createTask = useCallback(async (taskCategori, taskTitle, taskDescription, modalCrTask, taskDedline, memberId) => { setLoading(true); try { - await createTaskAPI(taskCategori, taskTitle, taskDescription); + await createTaskAPI(taskCategori, taskTitle, taskDescription, taskDedline, memberId); await loadBoardData(); modalCrTask(null)(); } catch (err) { - console.error('Ошибка создания задачи:', err); setError('Ошибка создания задачи'); } finally { setLoading(false); @@ -103,12 +102,16 @@ export const useBoardLogic = (id, setError, setInfo, setCategories, setLoading, } }, [loadBoardData, setLoading, setError]); - const editTask = useCallback(async (editedTaskId, taskTitle, taskDescription, taskCategory, modalEditTask) => { + const editTask = useCallback(async (editedTaskId, taskTitle, taskDescription, taskCategory, taskDeadline, modalEditTask) => { setLoading(true); try { await updateTaskAPI( editedTaskId, 'title', taskTitle ); await updateTaskAPI( editedTaskId, 'description', taskDescription ); await updateTaskAPI( editedTaskId, 'category', Number(taskCategory) ); + if (typeof taskDeadline != "string") { + taskDeadline = null + } + await updateTaskAPI( editedTaskId, 'deadline', taskDeadline ); await loadBoardData(); modalEditTask({}, null)(); } catch (err) { diff --git a/src/KBBoard/KBBoard.js b/src/KBBoard/KBBoard.js index fc92c1c..0b249a5 100644 --- a/src/KBBoard/KBBoard.js +++ b/src/KBBoard/KBBoard.js @@ -36,6 +36,8 @@ const KBBoard = () => { const [taskDescription, setTaskDescription] = useState(''); const [taskCategory, setTaskCategory] = useState(null); const [taskCategori, setTaskCategori] = useState(null); + const [taskDeadline, setTaskDeadline] = useState(''); + const [assignedMembers, setAssignedMembers] = useState(null); const [editedTask, setEditedTask] = useState({}); const [editedCateg, setEditedCateg] = useState({}); const [taskPosition, setTaskPosition] = useState(null); @@ -57,19 +59,21 @@ const KBBoard = () => { addMember, deleteBoards, quitMember, - deleteMember + deleteMember, } = useBoardLogic(id, setError, setInfo, setCategories, setLoading, setItems); function ListItem({ item }) { if (!item) return null; const user = () => { navigate('/profile/' + item.id); }; return ( - + <> + + ); }; @@ -89,6 +93,7 @@ const KBBoard = () => { setTaskCategori(categori); setTaskTitle(''); setTaskDescription(''); + setTaskDeadline('') } const modalCrCateg = () => { setCrCateg(!crCateg); @@ -107,6 +112,7 @@ const KBBoard = () => { setTaskDescription(task.description); setTaskPosition(task.position); setTaskCategory(task.category_id); + setTaskDeadline(task.deadline) } const modalEditCateg = (categ) => () => { setEdCateg(!edCateg); @@ -144,7 +150,7 @@ const KBBoard = () => { }; const handleCreateTask = async (e) => { e.preventDefault(); - await createTask(taskCategori, taskTitle, taskDescription, modalCrTask); + await createTask(taskCategori, taskTitle, taskDescription, modalCrTask, taskDeadline, assignedMembers); }; const handleEditBoard = async (e) => { e.preventDefault(); @@ -156,7 +162,7 @@ const KBBoard = () => { }; const handleEditTask = async (e) => { e.preventDefault(); - await editTask(editedTask.id, taskTitle, taskDescription, taskCategory, modalEditTask); + await editTask(editedTask.id, taskTitle, taskDescription, taskCategory, taskDeadline, modalEditTask); }; const handleDeleteTask = async (e) => { e.preventDefault(); @@ -202,11 +208,13 @@ const KBBoard = () => {

@@ -268,11 +276,23 @@ const KBBoard = () => { )) ) : ( @@ -360,6 +380,28 @@ const KBBoard = () => { onChange={(e) => setTaskDescription(e.target.value)} /> +
+ + setTaskDeadline(e.target.value)} + step="1" // для секунд + /> +
+
+ + +
@@ -442,6 +484,16 @@ const KBBoard = () => { onChange={(e) => setTaskDescription(e.target.value)} required /> +
+ + + setTaskDeadline(e.target.value)} + step="1" // для секунд + /> +