Skip to content

P
planner-team-one
Commit 7e02a2b3 authored by Ibadullina Inabat's avatar Ibadullina Inabat
Browse files
Options

Merge branch 'development' of… 

Merge branch 'development' of ssh://git.attractor-school.com:30022/apollo64/crm-team-one into task-26-fix/password_recovery
parents af3c33a7 f43aba8e
Show whitespace changes
Inline Side-by-side
Showing with 307 additions and 288 deletions
planner-api/src/helpers.ts
View file @ 7e02a2b3
...@@ -176,7 +176,7 @@ export const taskFinderByDateTimeTaskId = async (dateTimeTaskId:string):Promise< ...@@ -176,7 +176,7 @@ export const taskFinderByDateTimeTaskId = async (dateTimeTaskId:string):Promise<
/**member finder by userId and projectId, return one task */ /**member finder by userId and projectId, return one task */
export const memberFinderById = async (userId:string, projectId:string)=>{ export const memberFinderById = async (userId:string, projectId:string):Promise<Member|null>=>{
const member = await dataSource const member = await dataSource
.getRepository(Member) .getRepository(Member)
.findOne({ .findOne({
...@@ -210,6 +210,13 @@ export let transporter = nodemailer.createTransport({ ...@@ -210,6 +210,13 @@ export let transporter = nodemailer.createTransport({
}) })
export const subtractHours= (date:Date, hours:number)=> {
const dateCopy = new Date(date);
dateCopy.setHours(dateCopy.getHours() - hours);
return dateCopy;
}
export const FRONTEND_URL = 'localhost:3000'; export const FRONTEND_URL = 'localhost:3000';
planner-api/src/models/User.ts
View file @ 7e02a2b3
...@@ -83,6 +83,8 @@ export class User extends BaseEntity implements IUser { ...@@ -83,6 +83,8 @@ export class User extends BaseEntity implements IUser {
@OneToMany(() => Member, (member: { user: User }) => member.user, {onDelete: 'CASCADE'}) @OneToMany(() => Member, (member: { user: User }) => member.user, {onDelete: 'CASCADE'})
members!: Member[]; members!: Member[];
// @OneToOne(()=>PasswordRecovery,)
@BeforeInsert() @BeforeInsert()
......
planner-api/src/routers/projects.ts
View file @ 7e02a2b3
...@@ -121,7 +121,6 @@ router.get('/user/:userId', async (req : Request, res : Response): Promise<Respo ...@@ -121,7 +121,6 @@ router.get('/user/:userId', async (req : Request, res : Response): Promise<Respo
router.post('/add-user/', authAdminProject, async (req: Request, res: Response):Promise<Response>=>{ router.post('/add-user/', authAdminProject, async (req: Request, res: Response):Promise<Response>=>{
const {userId, projectId, roleProject} = req.body; const {userId, projectId, roleProject} = req.body;
console.log("req body" + req.body)
const newMember:Member = new Member(); const newMember:Member = new Member();
try{ try{
newMember.user= userId; newMember.user= userId;
...@@ -139,10 +138,8 @@ router.post('/add-user/', authAdminProject, async (req: Request, res: Response): ...@@ -139,10 +138,8 @@ router.post('/add-user/', authAdminProject, async (req: Request, res: Response):
/** Remove user from specific project by userId */ /** Remove user from specific project by userId */
router.delete('/remove-user/:userId', authAdminProject,async (req: Request, res: Response):Promise<Response>=> { router.delete('/remove-user/:userId', authAdminProject,async (req: Request, res: Response):Promise<Response>=> {
console.log('req.body ', req.body)
const {projectId} = req.body; const {projectId} = req.body;
const {userId }=req.params; const {userId }=req.params;
console.log('projectId ', projectId, 'userId ',userId )
try{ try{
const projectMember = await dataSource const projectMember = await dataSource
...@@ -161,10 +158,8 @@ router.delete('/remove-user/:userId', authAdminProject,async (req: Request, res: ...@@ -161,10 +158,8 @@ router.delete('/remove-user/:userId', authAdminProject,async (req: Request, res:
} }
} }
}) })
console.log('projectMember ', projectMember)
if(!projectMember) return res.status(404).send({message:"this member is not present"}) if(!projectMember) return res.status(404).send({message:"this member is not present"})
await Member.delete({id:projectMember.id}) await Member.delete({id:projectMember.id})
console.log('projectMember deleted successfully')
return res.send({message:"User removed from project successfully" }) return res.send({message:"User removed from project successfully" })
} catch(e){ } catch(e){
return res.send({message:'Failed to remove user from project'}) return res.send({message:'Failed to remove user from project'})
......
planner-api/src/routers/tasks.ts
View file @ 7e02a2b3
...@@ -3,9 +3,9 @@ import {Task} from '../models/Task'; ...@@ -3,9 +3,9 @@ import {Task} from '../models/Task';
import {myDataSource} from '../app-data-source'; import {myDataSource} from '../app-data-source';
import { User } from '../models/User'; import { User } from '../models/User';
import { Member, MemberRole } from '../models/Member'; import { Member, MemberRole } from '../models/Member';
import { In } from 'typeorm'; import { Equal, In, Not } from 'typeorm';
import { DateTimeTask } from '../models/DateTimeTask'; import { DateTimeTask } from '../models/DateTimeTask';
import { auth, authAuthorOrExecutorOfTask, taskFinderById } from '../helpers'; import { auth, authAuthorOrExecutorOfTask, subtractHours, taskFinderById } from '../helpers';
import { Project } from '../models/Project'; import { Project } from '../models/Project';
const router:Router = express.Router(); const router:Router = express.Router();
const dataSource = myDataSource; const dataSource = myDataSource;
...@@ -27,6 +27,15 @@ router.get('/', async(req:Request, res:Response):Promise<Response> => { ...@@ -27,6 +27,15 @@ router.get('/', async(req:Request, res:Response):Promise<Response> => {
/**create new task for table MyTask*/ /**create new task for table MyTask*/
router.post('/', auth, async(req:Request, res:Response):Promise<Response>=>{ router.post('/', auth, async(req:Request, res:Response):Promise<Response>=>{
const {user,title,description,project,executor,dateTimeStart,dateTimeDue, dateTimeDeadLine,priority} = req.body; const {user,title,description,project,executor,dateTimeStart,dateTimeDue, dateTimeDeadLine,priority} = req.body;
//** if dateTimeDue is null , then dateTimeDeadLine copied to dateTimeDue and dateTimeStart = dateTimeDue - 1 hour*/
let dateTimeDueFinal = dateTimeDue
let dateTimeStartFinal = dateTimeStart
let dateTimeDeadlineFinal= dateTimeDeadLine
if (!dateTimeDue && dateTimeDeadLine) {
dateTimeDueFinal = dateTimeDeadLine
dateTimeStartFinal = subtractHours(dateTimeDueFinal, 1)
}
const newTask = new Task(); const newTask = new Task();
newTask.title = title; newTask.title = title;
newTask.description = description; newTask.description = description;
...@@ -75,20 +84,24 @@ router.post('/', auth, async(req:Request, res:Response):Promise<Response>=>{ ...@@ -75,20 +84,24 @@ router.post('/', auth, async(req:Request, res:Response):Promise<Response>=>{
newMember.project=newPersonalProject; newMember.project=newPersonalProject;
newMember.roleProject = MemberRole.ADMIN; newMember.roleProject = MemberRole.ADMIN;
await newMember.save(); await newMember.save();
console.log ('newPersonalProject ', newPersonalProject)
} }
} }
newTask.dateTimeDeadLine= dateTimeDeadlineFinal;
newTask.dateTimeDeadLine=dateTimeDeadLine;
newTask.author= user; newTask.author= user;
if(newTask.project.title==="Личные дела"){
newTask.executor=user;
} else {
newTask.executor= executor; newTask.executor= executor;
}
newTask.priority = priority; newTask.priority = priority;
await newTask.save(); await newTask.save();
if (dateTimeDeadlineFinal) {
const newDateTimeTask = new DateTimeTask(); const newDateTimeTask = new DateTimeTask();
newDateTimeTask.dateTimeStart = dateTimeStart newDateTimeTask.dateTimeStart = dateTimeStartFinal
newDateTimeTask.dateTimeDue = dateTimeDue newDateTimeTask.dateTimeDue = dateTimeDueFinal
newDateTimeTask.task = newTask newDateTimeTask.task = newTask
await newDateTimeTask.save() await newDateTimeTask.save()
}
return res.send({newTask}); return res.send({newTask});
}) })
...@@ -142,7 +155,6 @@ router.post('/users', auth, async(req:Request, res:Response):Promise<Response>=> ...@@ -142,7 +155,6 @@ router.post('/users', auth, async(req:Request, res:Response):Promise<Response>=>
newMember.project=newPersonalProject; newMember.project=newPersonalProject;
newMember.roleProject = MemberRole.ADMIN; newMember.roleProject = MemberRole.ADMIN;
await newMember.save(); await newMember.save();
console.log ('newPersonalProject ', newPersonalProject)
} }
} }
...@@ -151,11 +163,13 @@ router.post('/users', auth, async(req:Request, res:Response):Promise<Response>=> ...@@ -151,11 +163,13 @@ router.post('/users', auth, async(req:Request, res:Response):Promise<Response>=>
newTask.executor= executor; newTask.executor= executor;
newTask.priority = priority; newTask.priority = priority;
await newTask.save(); await newTask.save();
if(dateTimeDue && dateTimeStart){
const newDateTimeTask = new DateTimeTask(); const newDateTimeTask = new DateTimeTask();
newDateTimeTask.dateTimeStart = dateTimeStart newDateTimeTask.dateTimeStart = dateTimeStart
newDateTimeTask.dateTimeDue = dateTimeDue newDateTimeTask.dateTimeDue = dateTimeDue
newDateTimeTask.task = newTask newDateTimeTask.task = newTask
await newDateTimeTask.save() await newDateTimeTask.save()
}
return res.send({newTask}); return res.send({newTask});
}) })
...@@ -169,48 +183,72 @@ router.get('/user/:userId', async (req: Request, res: Response):Promise<Response ...@@ -169,48 +183,72 @@ router.get('/user/:userId', async (req: Request, res: Response):Promise<Response
relations:{ relations:{
executor:true, executor:true,
}, },
where:[ where:
{ {
executor:{ executor:{
id:userId id:userId
} }
}, },
]
}) })
return res.send({tasks}) return res.send({tasks})
}) })
/**check tasks of current user where he is author or executor, search by id*/ /**check tasks of current user where he is executor(works for tbl MyTasks), search by id*/
router.get('/my',auth, async (req: Request, res: Response):Promise<Response>=>{ router.get('/my',auth, async (req: Request, res: Response):Promise<Response>=>{
const user = req.body.user const user = req.body.user
const projectsRawId = await dataSource
.getRepository(Project)
.find({
select:{
id:true
},
where:{
title:Not(Equal("Не определено")),
members:{
user:{
id: user.id
},
roleProject:Not(MemberRole.WATCHER)
}
}
}
)
const projectsList= projectsRawId.map(project=> {return project.id})
const tasks = await dataSource const tasks = await dataSource
.getRepository(Task) .getRepository(Task)
.find({ .find(
relations:{ {relations:{
executor:true,
author:true, author:true,
executor:true,
project:true
}, },
where:[ where:{
{
executor:{ executor:{
id:user.id id:user.id
}
}, },
{
author:{
id:user.id
} }
}
)
const projects = await dataSource
.getRepository(Project)
.find({
relations:{
members:true
}, },
] where:{
}) id:In(projectsList)
return res.send({tasks}) }
}) })
return res.send({tasks, projects})
})
/**return tasks & users of projects in which current user is involved, search by token*/ /**return tasks & users of projects in which current user is involved, search by token*/
router.get('/related', auth,async (req: Request, res: Response):Promise<Response>=>{ router.get('/related', auth,async (req: Request, res: Response):Promise<Response>=>{
console.log('related')
const user = req.body.user const user = req.body.user
const tasks = await dataSource const tasks = await dataSource
.createQueryBuilder() .createQueryBuilder()
...@@ -269,7 +307,8 @@ router.delete('/:taskId',async (req: Request, res: Response):Promise<Response>=> ...@@ -269,7 +307,8 @@ router.delete('/:taskId',async (req: Request, res: Response):Promise<Response>=>
/**change of task by task id */ /**change of task by task id */
router.put('/:taskId',authAuthorOrExecutorOfTask,async(req:Request, res:Response)=> { router.put('/:taskId',authAuthorOrExecutorOfTask,async(req:Request, res:Response)=> {
const {taskId} = req.params const {taskId} = req.params
const {authorStatus,executorStatus,title,description,note, archive,project,dateTimeTaskId,dateTimeStart,dateTimeDue,executor,accomplish,dateTimeDeadLine, dateTimeFactDeadLine,priority} = req.body; const {authorStatus,executorStatus,title,description,note, archive,project,dateTimeTaskId,dateTimeStart,
dateTimeDue,executor,accomplish,dateTimeDeadLine, dateTimeFactDeadLine,priority} = req.body;
const task = await taskFinderById(taskId) const task = await taskFinderById(taskId)
if (!task) return res.status(404).send({Message:'task not found'}) if (!task) return res.status(404).send({Message:'task not found'})
let dateTimeTask = null; let dateTimeTask = null;
...@@ -341,7 +380,7 @@ router.post('/project',async (req: Request, res: Response):Promise<Response>=>{ ...@@ -341,7 +380,7 @@ router.post('/project',async (req: Request, res: Response):Promise<Response>=>{
/**check other users tasks that are related to the user through common projects, by user token*/ /**check other users tasks that are related to the user through common projects, by user token*/
router.get('/users-tasks', auth,async (req: Request, res: Response):Promise<Response>=>{ router.get('/users-tasks', auth,async (req: Request, res: Response):Promise<Response>=>{
const {user} = req.body const {user} = req.body
const projects = await dataSource const projectsWithTasks = await dataSource
.getRepository(Project) .getRepository(Project)
.find( .find(
{ relations:{ { relations:{
...@@ -355,21 +394,38 @@ router.get('/users-tasks', auth,async (req: Request, res: Response):Promise<Resp ...@@ -355,21 +394,38 @@ router.get('/users-tasks', auth,async (req: Request, res: Response):Promise<Resp
members:{ members:{
user:{ user:{
id:user.id id:user.id
},
project:{
title:Not(Equal("Личные дела"))
} }
} }
}}) }})
if (!projects) return res.status(404).send({Message:'projects not found'}) if (!projectsWithTasks) return res.status(404).send({Message:'projects not found'})
let tasks:Task[] = [] let tasks:Task[] = []
if (projects.length>0) { if (projectsWithTasks.length>0) {
for (let project of projects){ for (let project of projectsWithTasks){
if (project?.tasks) { if (project?.tasks) {
tasks=tasks.concat(project.tasks) tasks=tasks.concat(project.tasks)
} }
} }
} }
const projectIds= projectsWithTasks.map(project=> {return project.id})
const projects = await dataSource
.getRepository(Project)
.find({
relations:{
members:{
user:true
}},
where:{
id:In(projectIds),
members:{
roleProject: Not(MemberRole.WATCHER)
}
},
})
return res.send({projects, tasks}) return res.send({projects, tasks})
}) })
......
planner-api/src/routers/users.ts
View file @ 7e02a2b3
...@@ -62,7 +62,6 @@ router.get('/all-fields/', async (req : Request, res : Response):Promise<object> ...@@ -62,7 +62,6 @@ router.get('/all-fields/', async (req : Request, res : Response):Promise<object>
}, },
} }
}) })
console.log('all fields users ', users)
return res.send({users}) return res.send({users})
}) })
......
planner-front/src/components/UI/ModalTask/ModalTask.js → planner-front/src/components/Calendars/ModalTask/ModalTask.js
View file @ 7e02a2b3
import Box from '@mui/material/Box'; import Box from '@mui/material/Box';
import Modal from '@mui/material/Modal'; import Modal from '@mui/material/Modal';
import { useEffect, useState } from 'react'; import { useCallback, useEffect, useMemo, useState } from 'react';
export default function ModalTask({modal, handleClose, children}) { export default function ModalTask({ modal, handleClose, children, week }) {
const [windowDimenion, detectHW] = useState({ const [windowDimenion, detectHW] = useState({
winWidth: window.innerWidth, winWidth: window.innerWidth,
...@@ -24,21 +24,30 @@ export default function ModalTask({modal, handleClose, children}) { ...@@ -24,21 +24,30 @@ export default function ModalTask({modal, handleClose, children}) {
} }
}, [windowDimenion]) }, [windowDimenion])
const getYCordinatesToModal = useCallback(() => {
const getYCordinatesToModal = () => { if (week) {
if (windowDimenion.winHeight > modal.yClickСordinates + 450) {
return modal.yClickСordinates - modal.yDivClick
} else {
return modal.yClickСordinates - 450
}
} else {
if (windowDimenion.winHeight > modal.yClickСordinates + 450) { if (windowDimenion.winHeight > modal.yClickСordinates + 450) {
return modal.yClickСordinates - modal.yDiv - modal.yDivClick return modal.yClickСordinates - modal.yDiv - modal.yDivClick
} else { } else {
return modal.yClickСordinates - modal.yDiv - modal.yDivClick - ((modal.yClickСordinates + 450) - windowDimenion.winHeight) - 30 return modal.yClickСordinates - modal.yDiv - modal.yDivClick - ((modal.yClickСordinates + 450) - windowDimenion.winHeight) - 30
} }
} }
const getXCordinatesToModal = () => { }, [windowDimenion.winHeight, modal])
const getXCordinatesToModal = useCallback(() => {
if (windowDimenion.winWidth > modal.xClickСordinates + 270 + modal.xDiv) { if (windowDimenion.winWidth > modal.xClickСordinates + 270 + modal.xDiv) {
return modal.xClickСordinates + modal.xDiv - modal.xDivClick + 10 return modal.xClickСordinates + modal.xDiv - modal.xDivClick + 10
} else { } else {
return windowDimenion.winWidth - (windowDimenion.winWidth - modal.xClickСordinates) - modal.xDivClick - 270 - 80 return windowDimenion.winWidth - (windowDimenion.winWidth - modal.xClickСordinates) - modal.xDivClick - 270 - 80
} }
} }, [windowDimenion.winWidth, modal])
const style = { const style = {
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
......
planner-front/src/components/Calendars/MonthCalendar/MonthCalendarBody/MonthCalendarBody.js
View file @ 7e02a2b3
...@@ -3,7 +3,7 @@ import { useCallback, useState } from "react"; ...@@ -3,7 +3,7 @@ import { useCallback, useState } from "react";
import CalendarRow from "../../CalendarRow/CalendarRow"; import CalendarRow from "../../CalendarRow/CalendarRow";
import CalendarSmallCell from "../../CalendarSmallCell/CalendarSmallCell"; import CalendarSmallCell from "../../CalendarSmallCell/CalendarSmallCell";
import CalendarStandartCell from "../../CalendarStandartCell/CalendarStandartCell"; import CalendarStandartCell from "../../CalendarStandartCell/CalendarStandartCell";
import ModalTask from "../../../UI/ModalTask/ModalTask" import ModalTask from "../../ModalTask/ModalTask"
import MonthCalendarModalContent from "../../CalendarModalTaskContent/CalendarModalTaskContent"; import MonthCalendarModalContent from "../../CalendarModalTaskContent/CalendarModalTaskContent";
import CalendarRowDay from "./CalendarRowDay/CalendarRowDay"; import CalendarRowDay from "./CalendarRowDay/CalendarRowDay";
......
planner-front/src/components/Calendars/WeekCalendar/WeekCalendarBody/CalendarColumnDayWeek/CalendarWeekTask/CalendarWeekTask.js
View file @ 7e02a2b3
...@@ -30,7 +30,7 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex, handleOpen, ...@@ -30,7 +30,7 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex, handleOpen,
}); });
setZIndexStyle(100) setZIndexStyle(100)
handleOpen(e) handleOpen(e)
}, [handleOpen, setCurrentTask]) }, [handleOpen, setCurrentTask, month])
const styles = { const styles = {
boxSizing: 'border-box', boxSizing: 'border-box',
......
planner-front/src/components/Calendars/WeekCalendar/WeekCalendarBody/WeekCalendarBody.js
View file @ 7e02a2b3
import { Grid } from "@mui/material"; import { Grid } from "@mui/material";
import { Box } from "@mui/system"; import { Box } from "@mui/system";
import { useCallback, useState } from "react"; import { useCallback, useState } from "react";
import ModalTask from "../../../UI/ModalTask/ModalTask"; import ModalTask from "../../ModalTask/ModalTask";
import MonthCalendarModalContent from "../../CalendarModalTaskContent/CalendarModalTaskContent"; import MonthCalendarModalContent from "../../CalendarModalTaskContent/CalendarModalTaskContent";
import CalendarRow from "../../CalendarRow/CalendarRow"; import CalendarRow from "../../CalendarRow/CalendarRow";
import CalendarSmallCell from "../../CalendarSmallCell/CalendarSmallCell"; import CalendarSmallCell from "../../CalendarSmallCell/CalendarSmallCell";
...@@ -95,6 +95,7 @@ function WeekCalendarBody({ week, hoursInDay, hourFormat, setHourFormat, date, t ...@@ -95,6 +95,7 @@ function WeekCalendarBody({ week, hoursInDay, hourFormat, setHourFormat, date, t
<ModalTask <ModalTask
modal={modal} modal={modal}
handleClose={() => { handleClose() }} handleClose={() => { handleClose() }}
week={true}
> >
<MonthCalendarModalContent <MonthCalendarModalContent
title={currentTask.title} title={currentTask.title}
......
planner-front/src/components/MyTasksCompoments/MyTaskToolBar.js
View file @ 7e02a2b3
...@@ -8,18 +8,18 @@ import MultipleSelect from '../../components/UI/MultipleSelect/MultipleSelect'; ...@@ -8,18 +8,18 @@ import MultipleSelect from '../../components/UI/MultipleSelect/MultipleSelect';
import Add from "@mui/icons-material/Add"; import Add from "@mui/icons-material/Add";
import Close from "@mui/icons-material/Close"; import Close from "@mui/icons-material/Close";
export default function MyTaskToolBar({projects,onClose,projectName,setProjectName,formStatus,onClick}) { export default function MyTaskToolBar({projects,onClose,projectIdListForTaskSelect,setProjectIdListForTaskSelect,formStatus,onClick}) {
let projectsFilter = let projectsFilter =
<></> <></>
if (projects) { if (Array.isArray(projects)) {
projectsFilter= projectsFilter=
<MultipleSelect <MultipleSelect
projects={projects} projects={projects}
onClose={onClose} onClose={onClose}
projectName={projectName} projectName={projectIdListForTaskSelect}
setProjectName={setProjectName} setProjectName={setProjectIdListForTaskSelect}
/> />
} }
......
planner-front/src/components/MyTasksCompoments/NewTaskForm.js
View file @ 7e02a2b3
...@@ -35,7 +35,7 @@ export default function NewTaskForm({ projects, setAddTaskForm }) { ...@@ -35,7 +35,7 @@ export default function NewTaskForm({ projects, setAddTaskForm }) {
dateTimeDeadLine: null, dateTimeDeadLine: null,
dateTimeTasks: [], dateTimeTasks: [],
dateTimeDue: null, dateTimeDue: null,
project: projects[0], project: null,
accomplish: "opened", accomplish: "opened",
priority: "B", priority: "B",
author: { id: user.id }, author: { id: user.id },
...@@ -127,14 +127,7 @@ export default function NewTaskForm({ projects, setAddTaskForm }) { ...@@ -127,14 +127,7 @@ export default function NewTaskForm({ projects, setAddTaskForm }) {
/> />
</TableCell> </TableCell>
<CustomTableCell
{...{
task,
name: "createdAt",
value: moment(task.createdAt).format("DD-MM-YYYY hh:mm A"),
width: "15%",
}}
/>
<CustomTableCell <CustomTableCell
{...{ {...{
...@@ -161,14 +154,6 @@ export default function NewTaskForm({ projects, setAddTaskForm }) { ...@@ -161,14 +154,6 @@ export default function NewTaskForm({ projects, setAddTaskForm }) {
/> />
</TableCell> </TableCell>
{/* <TableCell>
<MaterialUIPickers
task={task}
name="dateTimeStart"
onChange={onDateChange}
/>
</TableCell> */}
<TableCell style={{ width: "20%", paddingLeft: "0" }}> <TableCell style={{ width: "20%", paddingLeft: "0" }}>
<MaterialUIPickers <MaterialUIPickers
task={task} task={task}
...@@ -213,12 +198,6 @@ export const header = [ ...@@ -213,12 +198,6 @@ export const header = [
disablePadding: true, disablePadding: true,
label: "Приоритет", label: "Приоритет",
}, },
{
id: "createdAt",
numeric: true,
disablePadding: false,
label: "Дата создания",
},
{ {
id: "title", id: "title",
numeric: false, numeric: false,
......
planner-front/src/components/UI/MultipleSelect/MultipleSelect.js
View file @ 7e02a2b3
...@@ -45,7 +45,10 @@ export default function MultipleSelect({projects,projectName,onClose,setProjectN ...@@ -45,7 +45,10 @@ export default function MultipleSelect({projects,projectName,onClose,setProjectN
return ( return (
<div> <div>
<FormControl sx={{ m: 1, width: 250,borderColor:'white' }}> <FormControl sx={{ m: 1, width: 250,borderColor:'white' }}>
<InputLabel placeholder='Choose Project' label='I am a really really long green TextField label' id="demo-multiple-name-label" sx={{color:'white', padding:'1' }}>Project</InputLabel> <InputLabel placeholder='Choose Project'
label='I am a really really long green TextField label'
id="demo-multiple-name-label" sx={{color:'white', padding:'1' }}
>Project</InputLabel>
<Select <Select
labelId="demo-multiple-name-label" labelId="demo-multiple-name-label"
label='Choose Project' label='Choose Project'
...@@ -59,13 +62,13 @@ export default function MultipleSelect({projects,projectName,onClose,setProjectN ...@@ -59,13 +62,13 @@ export default function MultipleSelect({projects,projectName,onClose,setProjectN
sx={{color:'white' }} sx={{color:'white' }}
onClose={(e)=>{onClose(projectName)}} onClose={(e)=>{onClose(projectName)}}
> >
{projects?.map((project) => ( {projects?.map((project,index) => (
<MenuItem <MenuItem
key={project} key={index}
value={project} value={project.id}
style={getStyles(project, projectName, theme)} style={getStyles(project.title, projectName, theme)}
> >
{project} {project.title}
</MenuItem> </MenuItem>
))} ))}
</Select> </Select>
......
planner-front/src/components/UI/Select/Select.js
View file @ 7e02a2b3
...@@ -6,7 +6,11 @@ import FormControl from "@mui/material/FormControl"; ...@@ -6,7 +6,11 @@ import FormControl from "@mui/material/FormControl";
import Select from "@mui/material/Select"; import Select from "@mui/material/Select";
export default function BasicSelect({value,label,name,onChange,task,items}) { export default function BasicSelect({value,label,name,onChange,task,items}) {
console.log('select value ', value)
console.log('select label ', label)
console.log('select name ', name)
console.log('select task ', task)
console.log('select items ', items)
return ( return (
<Box sx={{ minWidth: 60, m: 0}}> <Box sx={{ minWidth: 60, m: 0}}>
<FormControl fullWidth> <FormControl fullWidth>
...@@ -19,11 +23,11 @@ export default function BasicSelect({value,label,name,onChange,task,items}) { ...@@ -19,11 +23,11 @@ export default function BasicSelect({value,label,name,onChange,task,items}) {
name={name} name={name}
onChange={(e) => onChange(e, task)} onChange={(e) => onChange(e, task)}
> >
{items.map((item) => ( {items ?items.map((item,index) => (
<MenuItem key={item.value} value={item.value}> <MenuItem key={index} value={item.value}>
{item.title} {item.title}
</MenuItem> </MenuItem>
))} )):null}
</Select> </Select>
</FormControl> </FormControl>
</Box> </Box>
......
planner-front/src/components/UsersTasksCompoments/CustomTableCell.js
View file @ 7e02a2b3
...@@ -12,6 +12,7 @@ const CustomTableCell = ({ ...@@ -12,6 +12,7 @@ const CustomTableCell = ({
onModalOpen, onModalOpen,
placeholder, placeholder,
user, user,
colSpan
}) => { }) => {
const styles = placeholder ? { width: "100%" } : { width: "auto" }; const styles = placeholder ? { width: "100%" } : { width: "auto" };
const divStyle = { const divStyle = {
...@@ -32,6 +33,7 @@ const CustomTableCell = ({ ...@@ -32,6 +33,7 @@ const CustomTableCell = ({
return ( return (
<> <>
<TableCell <TableCell
colSpan={colSpan}
onClick={(e) => (onModalOpen ? onModalOpen(e, task) : null)} onClick={(e) => (onModalOpen ? onModalOpen(e, task) : null)}
align="left" align="left"
// style={styles} // style={styles}
......
planner-front/src/components/UsersTasksCompoments/NewTaskForm.js
View file @ 7e02a2b3
...@@ -18,13 +18,13 @@ import moment from "moment"; ...@@ -18,13 +18,13 @@ import moment from "moment";
import CustomTableCell from "./CustomTableCell"; import CustomTableCell from "./CustomTableCell";
import MaterialUIPickers from "./DateTimePicker/DateTimePicker"; import MaterialUIPickers from "./DateTimePicker/DateTimePicker";
import BasicSelect from "../UI/Select/Select"; import BasicSelect from "../UI/Select/Select";
import { addTask } from "../../store/actions/tasksActions"; import { addTaskToUserTasksTable } from "../../store/actions/tasksActions";
import TaskModal from "./TaskModal/TaskModal"; import TaskModal from "./TaskModal/TaskModal";
export default function NewTaskForm({ export default function NewTaskForm({
projects, projects,
currentProject, currentProject,
setCurrentProject,
setAddTaskForm, setAddTaskForm,
}) { }) {
const dispatch = useDispatch(); const dispatch = useDispatch();
...@@ -40,7 +40,7 @@ export default function NewTaskForm({ ...@@ -40,7 +40,7 @@ export default function NewTaskForm({
dateTimeDeadLine: null, dateTimeDeadLine: null,
dateTimeTasks: [], dateTimeTasks: [],
dateTimeDue: null, dateTimeDue: null,
project: projects[0], project: null,
accomplish: "opened", accomplish: "opened",
priority: "B", priority: "B",
author: { id: user.id }, author: { id: user.id },
...@@ -48,8 +48,8 @@ export default function NewTaskForm({ ...@@ -48,8 +48,8 @@ export default function NewTaskForm({
executor:null, executor:null,
isEditMode: true, isEditMode: true,
}); });
const [modal, setModal] = useState(false); const [modal, setModal] = useState(false);
console.log('NewTaskForm currentProject ', currentProject )
const onModalOpen = (event, task) => { const onModalOpen = (event, task) => {
event.stopPropagation(); event.stopPropagation();
...@@ -69,17 +69,21 @@ export default function NewTaskForm({ ...@@ -69,17 +69,21 @@ export default function NewTaskForm({
const onProjectChange = (e, task) => { const onProjectChange = (e, task) => {
const value = e.target.value; const value = e.target.value;
const project = projects.find((e) => e.id === value); const project = projects.find((project) => project.id === value);
setCurrentProject(project)
const newTask = { ...task }; const newTask = { ...task };
newTask.project = project; newTask.project = project;
setTask(newTask); setTask(newTask);
}; };
const onExecutorChange = (e, task) => { const onExecutorChange = (e, task) => {
const value = e.target.value; const {value, name} = e.target.value;
const executor = projects.find((e) => e.id === value); let executorMember = null
const newTask = { ...task }; const newTask = { ...task };
newTask.executor = executor; if( name==='executor' && value!==null) {
executorMember = currentProject.find((member) => member.user.id === value);
newTask.executor = executorMember?.user;
}
setTask(newTask); setTask(newTask);
}; };
...@@ -92,7 +96,7 @@ export default function NewTaskForm({ ...@@ -92,7 +96,7 @@ export default function NewTaskForm({
}; };
const handleAddTask = () => { const handleAddTask = () => {
dispatch(addTask(task)); dispatch(addTaskToUserTasksTable(task));
setAddTaskForm(); setAddTaskForm();
}; };
...@@ -115,6 +119,7 @@ export default function NewTaskForm({ ...@@ -115,6 +119,7 @@ export default function NewTaskForm({
key={headCell.id} key={headCell.id}
align="center" align="center"
padding={headCell.disablePadding ? "none" : "normal"} padding={headCell.disablePadding ? "none" : "normal"}
colSpan={headCell.colSpan}
> >
{headCell.label} {headCell.label}
</TableCell> </TableCell>
...@@ -139,14 +144,9 @@ export default function NewTaskForm({ ...@@ -139,14 +144,9 @@ export default function NewTaskForm({
/> />
</TableCell> </TableCell>
<CustomTableCell <CustomTableCell
{...{ colSpan={3}
task,
name: "createdAt",
value: moment(task.createdAt).format("DD-MM-YYYY hh:mm A"),
}}
/>
<CustomTableCell
{...{ {...{
task, task,
name: "title", name: "title",
...@@ -159,9 +159,9 @@ export default function NewTaskForm({ ...@@ -159,9 +159,9 @@ export default function NewTaskForm({
<TableCell> <TableCell>
<BasicSelect <BasicSelect
items={projects.map((e) => ({ items={projects?.map((project) => ({
value: e?.id, value: project?.id,
title: e?.title, title: project?.title,
}))} }))}
task={task} task={task}
onChange={onProjectChange} onChange={onProjectChange}
...@@ -171,24 +171,19 @@ export default function NewTaskForm({ ...@@ -171,24 +171,19 @@ export default function NewTaskForm({
</TableCell> </TableCell>
<TableCell> <TableCell>
<BasicSelect <BasicSelect
items={currentProject.members.map((member) => ({ items={currentProject?currentProject?.members.map((member) => ({
value: member?.id, value: member?.user?.id,
title: member?.displayName, title: member?.user?.displayName,
}))} })):null}
task={task} task={task}
onChange={onExecutorChange} onChange={onExecutorChange}
name="executor" name="executor"
value={task.executor?.id} value={task.executor?.id}
defaultValue={user.id}
/> />
</TableCell> </TableCell>
{/* <TableCell>
<MaterialUIPickers
task={task}
name="dateTimeStart"
onChange={onDateChange}
/>
</TableCell> */}
<TableCell> <TableCell>
<MaterialUIPickers <MaterialUIPickers
...@@ -235,17 +230,12 @@ export const header = [ ...@@ -235,17 +230,12 @@ export const header = [
disablePadding: true, disablePadding: true,
label: "Приоритет", label: "Приоритет",
}, },
{ {
id: "createdAt",
numeric: true,
disablePadding: false,
label: "Дата создания",
},
{
id: "title", id: "title",
numeric: false, numeric: false,
disablePadding: false, disablePadding: false,
label: "Заголовок", label: "Заголовок",
colSpan:3
}, },
{ {
id: "projectName", id: "projectName",
...@@ -260,7 +250,7 @@ export const header = [ ...@@ -260,7 +250,7 @@ export const header = [
label: "Исполнитель", label: "Исполнитель",
}, },
{ {
id: "dateTimeDue", id: "dateTimeDeadLine",
numeric: true, numeric: true,
disablePadding: false, disablePadding: false,
label: "Дедлайн", label: "Дедлайн",
......
planner-front/src/components/UsersTasksCompoments/UsersTaskToolBar.js
View file @ 7e02a2b3
...@@ -8,18 +8,18 @@ import MultipleSelect from '../UI/MultipleSelect/MultipleSelect'; ...@@ -8,18 +8,18 @@ import MultipleSelect from '../UI/MultipleSelect/MultipleSelect';
import Add from "@mui/icons-material/Add"; import Add from "@mui/icons-material/Add";
import Close from "@mui/icons-material/Close"; import Close from "@mui/icons-material/Close";
export default function MyTaskToolBar({projects,onClose,projectName,setProjectName,formStatus,onClick}) { export default function UsersTaskToolBar({projects,onClose,projectIdListForTaskSelect,setProjectIdListForTaskSelect,formStatus,onClick}) {
let projectsFilter = let projectsFilter =
<></> <></>
if (projects) { if (Array.isArray(projects)) {
projectsFilter= projectsFilter=
<MultipleSelect <MultipleSelect
projects={projects} projects={projects}
onClose={onClose} onClose={onClose}
projectName={projectName} projectName={projectIdListForTaskSelect}
setProjectName={setProjectName} setProjectName={setProjectIdListForTaskSelect}
/> />
} }
...@@ -27,7 +27,8 @@ export default function MyTaskToolBar({projects,onClose,projectName,setProjectNa ...@@ -27,7 +27,8 @@ export default function MyTaskToolBar({projects,onClose,projectName,setProjectNa
<Box sx={{ flexGrow: 1 }}> <Box sx={{ flexGrow: 1 }}>
<AppBar position="static"> <AppBar position="static">
<Toolbar> <Toolbar
>
<Typography variant="h6" component="div" sx={{ flexGrow: 1 }}> <Typography variant="h6" component="div" sx={{ flexGrow: 1 }}>
Задачи сотрудников Задачи сотрудников
</Typography> </Typography>
......
planner-front/src/containers/ForgottenPassword/ForgottenPassword.js
View file @ 7e02a2b3
...@@ -7,6 +7,7 @@ import PersonIcon from '@mui/icons-material/Person'; ...@@ -7,6 +7,7 @@ import PersonIcon from '@mui/icons-material/Person';
import styled from "@emotion/styled"; import styled from "@emotion/styled";
import { Alert, Avatar, Container, Typography } from "@mui/material"; import { Alert, Avatar, Container, Typography } from "@mui/material";
import ResetPasswordForm from "../../components/UserForm/ResetPasswordForm"; import ResetPasswordForm from "../../components/UserForm/ResetPasswordForm";
import axios from "axios";
const StyledContainer = styled(Container)` const StyledContainer = styled(Container)`
padding-top: 30px; padding-top: 30px;
......
planner-front/src/containers/MyTasks/MyTasks.js
View file @ 7e02a2b3
...@@ -22,6 +22,7 @@ export default function EnhancedTable() { ...@@ -22,6 +22,7 @@ export default function EnhancedTable() {
const dispatch = useDispatch(); const dispatch = useDispatch();
const tasks = useSelector((state) => state.tasks.tasks); const tasks = useSelector((state) => state.tasks.tasks);
const projects = useSelector((state) => state.tasks.projects);
const user = useSelector((state) => state.users.user); const user = useSelector((state) => state.users.user);
const [recievedTasks, setRecievedTasks] = useState([]); const [recievedTasks, setRecievedTasks] = useState([]);
const [addTaskForm, setAddTaskForm] = useState(false); const [addTaskForm, setAddTaskForm] = useState(false);
...@@ -33,22 +34,15 @@ export default function EnhancedTable() { ...@@ -33,22 +34,15 @@ export default function EnhancedTable() {
open: false, open: false,
task: null, task: null,
}); });
const [projects, setProjects] = useState(["1", "2"]);
useEffect(() => {
dispatch(fetchAllTasks());
filterProjectsNamesFromTasks();
}, [dispatch]);
useEffect(() => { useEffect(() => {
dispatch(fetchAllTasks());
if (tasks && tasks?.length > 0) { if (tasks && tasks?.length > 0) {
setRecievedTasks(tasks); setRecievedTasks(tasks);
} }
}, [dispatch, tasks]); }, [ tasks?.length,addTaskForm, setAddTaskForm, dispatch]);
console.log('tasks ', tasks, 'projects ', projects)
useEffect(() => {
dispatch(fetchAllTasks());
}, [addTaskForm, setAddTaskForm]);
...@@ -111,7 +105,7 @@ export default function EnhancedTable() { ...@@ -111,7 +105,7 @@ export default function EnhancedTable() {
const onProjectChange = (e, task) => { const onProjectChange = (e, task) => {
const value = e.target.value; const value = e.target.value;
const project = uniqueProjects.find((e) => e.id === value); const project = projects.find((e) => e.id === value);
const { id } = task; const { id } = task;
const newTasks = recievedTasks.map((task) => { const newTasks = recievedTasks.map((task) => {
if (task.id === id) { if (task.id === id) {
...@@ -162,16 +156,9 @@ export default function EnhancedTable() { ...@@ -162,16 +156,9 @@ export default function EnhancedTable() {
}; };
const deleteDateTimeTaskHandle=(dateTimeTaskId)=>{ const deleteDateTimeTaskHandle=(dateTimeTaskId)=>{
console.log('delete by dateTimeTaskId ', dateTimeTaskId)
dispatch(deleteDateTimeTask(dateTimeTaskId)) dispatch(deleteDateTimeTask(dateTimeTaskId))
} }
const handleEditDateTimeTask=(dateTimeTask)=>{
console.log('edit by dateTImeTask')
// dispatch(handleEditDateTimeTask(dateTimeTask))
}
const onModalOpen = (event, task) => { const onModalOpen = (event, task) => {
event.stopPropagation(); event.stopPropagation();
setModal({ ...modal, open: true, id: task.id }); setModal({ ...modal, open: true, id: task.id });
...@@ -182,46 +169,17 @@ export default function EnhancedTable() { ...@@ -182,46 +169,17 @@ export default function EnhancedTable() {
}; };
// ++++++++фильтрация по проектам+++++++++++++++ // ++++++++фильтрация по проектам+++++++++++++++
const [projectName, setProjectName] = React.useState([]); const [projectIdListForTaskSelect, setProjectIdListForTaskSelect] = React.useState([]);
const [filterProjectTumbler, setFilterProjectTumbler] = React.useState(false); const [filterProjectTumbler, setFilterProjectTumbler] = React.useState(false);
const onClose = (projectName) => { const onClose=(projectIdListForTaskSelect)=>{
let tasksFilteredByProject = tasks; let tasksFilteredByProject = tasks
if (projectName.length > 0) { if (projectIdListForTaskSelect.length>0) {
tasksFilteredByProject = tasks.filter((task) => tasksFilteredByProject = tasks.filter(task=>projectIdListForTaskSelect.includes(task.project?.id))
projectName.includes(task.project?.title)
);
} }
setRecievedTasks(tasksFilteredByProject); setRecievedTasks(tasksFilteredByProject)
setFilterProjectTumbler(true); setFilterProjectTumbler(true)
};
const rawProjects = tasks?.map((task) => task.project);
const filterProjectsNamesFromTasks = () => {
if (tasks && tasks?.length > 0) {
let rawSetProjectNames = [];
for (let project of rawProjects) {
if (project === null) {
} else {
rawSetProjectNames.push(project.title);
}
}
let uniqueTitlesProjects = [...new Set(rawSetProjectNames)];
setProjects(uniqueTitlesProjects);
}
};
const uniqueProjects = rawProjects?.reduce((results, value, index) => {
const exist = results.find((v) => {
return v !== null && v.id === value?.id;
});
if (!exist && value !== null) {
results.push(value);
} }
return results;
}, []);
console.log('tasks', tasks)
if ( if (
tasks && tasks &&
...@@ -237,13 +195,13 @@ console.log('tasks', tasks) ...@@ -237,13 +195,13 @@ console.log('tasks', tasks)
formStatus={addTaskForm} formStatus={addTaskForm}
projects={projects} projects={projects}
onClose={onClose} onClose={onClose}
projectName={projectName} projectIdListForTaskSelect={projectIdListForTaskSelect}
setProjectName={setProjectName} setProjectIdListForTaskSelect={setProjectIdListForTaskSelect}
/> />
{addTaskForm ? ( {addTaskForm ? (
<NewTaskForm <NewTaskForm
projects={uniqueProjects} projects={projects}
setAddTaskForm={() => setAddTaskForm(false)} setAddTaskForm={() => setAddTaskForm(false)}
/> />
) : null} ) : null}
...@@ -267,13 +225,11 @@ console.log('tasks', tasks) ...@@ -267,13 +225,11 @@ console.log('tasks', tasks)
task={task} task={task}
deleteHandle={deleteHandle} deleteHandle={deleteHandle}
handleEditTask ={handleEditTask} handleEditTask ={handleEditTask}
handleEditDateTimeTask={handleEditDateTimeTask}
deleteDateTimeTask={deleteDateTimeTaskHandle} deleteDateTimeTask={deleteDateTimeTaskHandle}
onChange={onChange} onChange={onChange}
onModalOpen={onModalOpen} onModalOpen={onModalOpen}
onProjectChange={onProjectChange} onProjectChange={onProjectChange}
uniqueProjects={uniqueProjects} uniqueProjects={projects}
onAuthorChange={onAuthorChange}
onDateChange={onDateChange} onDateChange={onDateChange}
onToggleEditMode={onToggleEditMode} onToggleEditMode={onToggleEditMode}
onToggleEditModeDone={onToggleEditModeDone} onToggleEditModeDone={onToggleEditModeDone}
......
planner-front/src/containers/UsersTasks/UsersTasks.js
View file @ 7e02a2b3
...@@ -11,8 +11,8 @@ import { useState, useEffect } from "react"; ...@@ -11,8 +11,8 @@ import { useState, useEffect } from "react";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import TaskModal from "../../components/UsersTasksCompoments/TaskModal/TaskModal"; import TaskModal from "../../components/UsersTasksCompoments/TaskModal/TaskModal";
import moment from "moment"; import moment from "moment";
import MyTaskToolBar from "../../components/UsersTasksCompoments/UsersTaskToolBar"; import UsersTaskToolBar from "../../components/UsersTasksCompoments/UsersTaskToolBar";
import { fetchAllTasks, deleteTask,editTask, deleteDateTimeTask} from "../../store/actions/tasksActions"; import { deleteTask, editTask, deleteDateTimeTask , fetchAllTasksByMembership} from "../../store/actions/tasksActions";
import NewTaskForm from "../../components/UsersTasksCompoments/NewTaskForm"; import NewTaskForm from "../../components/UsersTasksCompoments/NewTaskForm";
import TableRowTask from "../../components/UsersTasksCompoments/TableRowTask/TableRowTask"; import TableRowTask from "../../components/UsersTasksCompoments/TableRowTask/TableRowTask";
import UsersTasksHeader from "./UsersTasksHeader/UsersTasksHeader"; import UsersTasksHeader from "./UsersTasksHeader/UsersTasksHeader";
...@@ -23,35 +23,30 @@ export default function UsersTasks() { ...@@ -23,35 +23,30 @@ export default function UsersTasks() {
const dispatch = useDispatch(); const dispatch = useDispatch();
const tasks = useSelector((state) => state.tasks.tasks); const tasks = useSelector((state) => state.tasks.tasks);
const projects = useSelector((state) => state.tasks.projects);
const user = useSelector((state) => state.users.user); const user = useSelector((state) => state.users.user);
const [executors, setExecutors]=useState([]) const [executors, setExecutors]=useState([])
const [projects,setProjects]=useState([])
const [currentProject, setCurrentProject] = useState(null); const [currentProject, setCurrentProject] = useState(null);
const [recievedTasks, setRecievedTasks] = useState([]); const [recievedTasks, setRecievedTasks] = useState([]);
const [addTaskForm, setAddTaskForm] = useState(false); const [addTaskForm, setAddTaskForm] = useState(false);
const [order, setOrder] = useState("asc"); const [order, setOrder] = useState("asc");
const [orderBy, setOrderBy] = useState("id"); const [orderBy, setOrderBy] = useState("id");
const [page, setPage] = useState(0); const [page, setPage] = useState(0);
const [rowsPerPage, setRowsPerPage] =useState(5); const [rowsPerPage, setRowsPerPage] =useState(25);
const [modal, setModal] = useState({ const [modal, setModal] = useState({
open: false, open: false,
task: null, task: null,
}); });
useEffect(() => { useEffect(() => {
dispatch(fetchAllTasks()); dispatch(fetchAllTasksByMembership());
filterProjectsNamesFromTasks()
if (tasks && tasks?.length > 0) { if (tasks && tasks?.length > 0) {
setRecievedTasks(tasks); setRecievedTasks(tasks);
} }
}, [dispatch, tasks?.length]); }, [dispatch,
tasks?.length,
useEffect(() => { addTaskForm, setAddTaskForm]);
dispatch(fetchAllTasks());
}, [addTaskForm, setAddTaskForm]);
const handleRequestSort = ( property) => { const handleRequestSort = ( property) => {
const isAsc = orderBy === property && order === "asc"; const isAsc = orderBy === property && order === "asc";
...@@ -73,7 +68,6 @@ useEffect(() => { ...@@ -73,7 +68,6 @@ useEffect(() => {
const name = e.target.name; const name = e.target.name;
const { id } = task; const { id } = task;
const newTasks = recievedTasks.map((task) => { const newTasks = recievedTasks.map((task) => {
console.log('recievedTasks.map ',task)
if (task.id === id) { if (task.id === id) {
return { ...task, [name]: value }; return { ...task, [name]: value };
} }
...@@ -82,20 +76,6 @@ useEffect(() => { ...@@ -82,20 +76,6 @@ useEffect(() => {
setRecievedTasks(newTasks); setRecievedTasks(newTasks);
}; };
const onAuthorChange = (e, task) => {
const value = e.target.value;
const { id } = task;
const newTasks = recievedTasks.map((task) => {
if (task.id === id) {
const updated = { ...task };
updated.author.displayName = value;
updated.authorDisplayName = value;
return updated;
}
return task;
});
setRecievedTasks(newTasks);
};
const onDateChange = (id, value, property) => { const onDateChange = (id, value, property) => {
const newTasks = recievedTasks.map((task) => { const newTasks = recievedTasks.map((task) => {
...@@ -112,13 +92,22 @@ useEffect(() => { ...@@ -112,13 +92,22 @@ useEffect(() => {
const onProjectChange = (e, task) => { const onProjectChange = (e, task) => {
const projectId = e.target.value; const projectId = e.target.value;
const project = uniqueProjects.find((uniqueProject) => uniqueProject.id === projectId); const project = projects.length>0 ?projects.find((uniqueProject) => uniqueProject.id === projectId):null;
setCurrentProject(project)
let executorList=[]
if(project?.members){
for (let member of project.members){
executorList.push(member.user)
}
}
setExecutors(executorList)
const { id } = task; const { id } = task;
const newTasks = recievedTasks.map((task) => { const newTasks = recievedTasks.map((task) => {
if (task.id === id) { if (task.id === id) {
const updated = { ...task }; const updated = { ...task };
updated.project = project; updated.project = project;
updated.projectName = project.title; updated.projectName =project.title? project.title:null;
return updated; return updated;
} }
return task; return task;
...@@ -187,12 +176,6 @@ useEffect(() => { ...@@ -187,12 +176,6 @@ useEffect(() => {
dispatch(deleteDateTimeTask(dateTimeTaskId)) dispatch(deleteDateTimeTask(dateTimeTaskId))
} }
const handleEditDateTimeTask=(dateTimeTask)=>{
console.log('edit by dateTImeTask')
// dispatch(handleEditDateTimeTask(dateTimeTask))
}
const onModalOpen = (event, task) => { const onModalOpen = (event, task) => {
event.stopPropagation(); event.stopPropagation();
setModal({ ...modal, open: true, id: task.id }); setModal({ ...modal, open: true, id: task.id });
...@@ -203,47 +186,18 @@ useEffect(() => { ...@@ -203,47 +186,18 @@ useEffect(() => {
}; };
// ++++++++фильтрация по проектам+++++++++++++++ // ++++++++фильтрация по проектам+++++++++++++++
const [projectName, setProjectName] = React.useState([]); const [projectIdListForTaskSelect, setProjectIdListForTaskSelect] = React.useState([]);
const [filterProjectTumbler, setFilterProjectTumbler] = React.useState(false); const [filterProjectTumbler, setFilterProjectTumbler] = React.useState(false);
const onClose=(projectName)=>{ const onClose=(projectIdListForTaskSelect)=>{
let tasksFilteredByProject = tasks let tasksFilteredByProject = tasks
if (projectName.length>0) { if (projectIdListForTaskSelect.length>0) {
tasksFilteredByProject = tasks.filter(task=>projectName.includes(task.project?.title)) tasksFilteredByProject = tasks.filter(task=>projectIdListForTaskSelect.includes(task.project?.id))
} }
setRecievedTasks(tasksFilteredByProject) setRecievedTasks(tasksFilteredByProject)
setFilterProjectTumbler(true) setFilterProjectTumbler(true)
} }
const rawProjects= tasks?.map(task=>task.project)
const filterProjectsNamesFromTasks = ()=>{
if (tasks && tasks?.length > 0) {
let rawSetProjectNames = []
for (let project of rawProjects){
if (project===null){
} else{
rawSetProjectNames.push(project.title)
}
}
let uniqueTitlesProjects = [...new Set(rawSetProjectNames)];
setProjects(uniqueTitlesProjects)
}
}
const uniqueProjects = rawProjects?.reduce((results, value, index) => {
const exist = results.find((v) => {
return v !== null && v.id === value?.id
});
if (!exist && value !== null) {
results.push(value);
}
return results;
}, []);
console.log('tasks', tasks)
if ( if (
tasks && tasks &&
...@@ -254,18 +208,19 @@ console.log('tasks', tasks) ...@@ -254,18 +208,19 @@ console.log('tasks', tasks)
return ( return (
<Box sx={{ width: "fullwidth" }}> <Box sx={{ width: "fullwidth" }}>
<Paper sx={{ width: "100%", mb: 2 }}> <Paper sx={{ width: "100%", mb: 2 }}>
<MyTaskToolBar <UsersTaskToolBar
onClick={() => setAddTaskForm(!addTaskForm)} onClick={() => setAddTaskForm(!addTaskForm)}
formStatus={addTaskForm} formStatus={addTaskForm}
projects={projects} projects={projects}
onClose={onClose} onClose={onClose}
projectName={projectName} projectIdListForTaskSelect={projectIdListForTaskSelect}
setProjectName={setProjectName} setProjectIdListForTaskSelect={setProjectIdListForTaskSelect}
/> />
{addTaskForm ? ( {addTaskForm ? (
<NewTaskForm <NewTaskForm
projects={uniqueProjects} projects={projects}
setCurrentProject={setCurrentProject}
currentProject={currentProject} currentProject={currentProject}
setAddTaskForm={()=>setAddTaskForm(false)} setAddTaskForm={()=>setAddTaskForm(false)}
/> />
...@@ -273,7 +228,7 @@ console.log('tasks', tasks) ...@@ -273,7 +228,7 @@ console.log('tasks', tasks)
<TableContainer> <TableContainer>
<Table sx={{ minWidth: 600 }} aria-labelledby="tableTitle"> <Table sx={{ minWidth: 600 }} aria-labelledby="tableTitle" size='small'>
<UsersTasksHeader <UsersTasksHeader
order={order} order={order}
orderBy={orderBy} orderBy={orderBy}
...@@ -292,15 +247,13 @@ console.log('tasks', tasks) ...@@ -292,15 +247,13 @@ console.log('tasks', tasks)
task={task} task={task}
deleteHandle={deleteHandle} deleteHandle={deleteHandle}
handleEditTask ={handleEditTask} handleEditTask ={handleEditTask}
handleEditDateTimeTask={handleEditDateTimeTask}
deleteDateTimeTask={deleteDateTimeTaskHandle} deleteDateTimeTask={deleteDateTimeTaskHandle}
onChange={onChange} onChange={onChange}
onModalOpen={onModalOpen} onModalOpen={onModalOpen}
onProjectChange={onProjectChange} onProjectChange={onProjectChange}
executors={executors} executors={executors}
onExecutorChange={onExecutorChange} onExecutorChange={onExecutorChange}
uniqueProjects={uniqueProjects} uniqueProjects={projects}
// onAuthorChange={onAuthorChange}
onDateChange={onDateChange} onDateChange={onDateChange}
onToggleEditMode={onToggleEditMode} onToggleEditMode={onToggleEditMode}
onToggleEditModeDone={onToggleEditModeDone} onToggleEditModeDone={onToggleEditModeDone}
......
planner-front/src/store/actionTypes/tasksTypes.js
View file @ 7e02a2b3
...@@ -25,3 +25,7 @@ export const EDIT_CALENDAR_TASK = "EDIT_CALENDAR_TASK"; ...@@ -25,3 +25,7 @@ export const EDIT_CALENDAR_TASK = "EDIT_CALENDAR_TASK";
export const DELETE_DATETIMETASK_REQUEST = "DELETE_TASK_REQUEST"; export const DELETE_DATETIMETASK_REQUEST = "DELETE_TASK_REQUEST";
export const DELETE_DATETIMETASK_SUCCESS = "DELETE_TASK_SUCCESS"; export const DELETE_DATETIMETASK_SUCCESS = "DELETE_TASK_SUCCESS";
export const DELETE_DATETIMETASK_FAILURE = "DELETE_TASK_FAILURE"; export const DELETE_DATETIMETASK_FAILURE = "DELETE_TASK_FAILURE";
export const FETCH_ALL_TASKS_BY_MEMBERSHIP_REQUEST = "FETCH_ALL_TASKS_BY_MEMBERSHIP_REQUEST";
export const FETCH_ALL_TASKS_BY_MEMBERSHIP_SUCCESS = "FETCH_ALL_TASKS_BY_MEMBERSHIP_SUCCESS";
export const FETCH_ALL_TASKS_BY_MEMBERSHIP_FAILURE = "FETCH_ALL_TASKS_BY_MEMBERSHIP_FAILURE";
\ No newline at end of file
planner-front/src/store/actions/tasksActions.js
View file @ 7e02a2b3
...@@ -18,6 +18,7 @@ import { ...@@ -18,6 +18,7 @@ import {
DELETE_DATETIMETASK_FAILURE, DELETE_DATETIMETASK_FAILURE,
DELETE_DATETIMETASK_SUCCESS, DELETE_DATETIMETASK_SUCCESS,
DELETE_DATETIMETASK_REQUEST, DELETE_DATETIMETASK_REQUEST,
FETCH_ALL_TASKS_BY_MEMBERSHIP_SUCCESS
} from "../actionTypes/tasksTypes"; } from "../actionTypes/tasksTypes";
import axios from '../../axiosPlanner' import axios from '../../axiosPlanner'
...@@ -29,8 +30,8 @@ const fetchCalendarTasksSuccess = (tasks) => { ...@@ -29,8 +30,8 @@ const fetchCalendarTasksSuccess = (tasks) => {
return {type: FETCH_CALENDAR_TASKS_SUCCESS, tasks} return {type: FETCH_CALENDAR_TASKS_SUCCESS, tasks}
}; };
const fetchAllTasksSuccess = (tasks) => { const fetchAllTasksSuccess = (tasks,projects) => {
return {type: FETCH_ALL_TASKS_SUCCESS, tasks} return {type: FETCH_ALL_TASKS_SUCCESS, tasks, projects}
}; };
...@@ -54,13 +55,36 @@ export const fetchAllTasks = () => { ...@@ -54,13 +55,36 @@ export const fetchAllTasks = () => {
return async (dispatch) => { return async (dispatch) => {
dispatch(fetchCalendarTasksRequest()); dispatch(fetchCalendarTasksRequest());
try { try {
const response = await axios.get("/tasks"); const response = await axios.get("/tasks/my");
dispatch(fetchAllTasksSuccess(response.data.tasks)) dispatch(fetchAllTasksSuccess(response.data.tasks,response.data.projects))
} catch (error) { } catch (error) {
dispatch(fetchCalendarTasksFailure(error.response.data)); dispatch(fetchCalendarTasksFailure(error.response.data));
} }
} }
}; };
//**fetch tasks for table UsersTasks, start*/
const fetchAllTasksByMembershipSuccess = (tasks, projects) => {
return {type: FETCH_ALL_TASKS_BY_MEMBERSHIP_SUCCESS, tasks, projects}
};
export const fetchAllTasksByMembership = () => {
return async (dispatch) => {
dispatch(fetchCalendarTasksRequest());
try {
const response = await axios.get("/tasks/users-tasks");
dispatch(fetchAllTasksByMembershipSuccess(response.data.tasks, response.data.projects))
} catch (error) {
dispatch(fetchCalendarTasksFailure(error.response.data));
}
}
};
//**end*/
const addTaskRequest = () => { const addTaskRequest = () => {
return {type: ADD_NEW_TASK_REQUEST} return {type: ADD_NEW_TASK_REQUEST}
}; };
...@@ -241,3 +265,33 @@ export const deleteDateTimeTask = (dateTimeTaskId) => { ...@@ -241,3 +265,33 @@ export const deleteDateTimeTask = (dateTimeTaskId) => {
} }
} }
} }
/** add new task in UserTasks Table */
const addTaskToUserTasksTableRequest = () => {
return {type: ADD_NEW_TASK_REQUEST}
};
const addTaskToUserTasksTableSuccess = () => {
return {type: ADD_NEW_TASK_SUCCESS}
};
const addTaskToUserTasksTableFailure = (error) => {
return {type: ADD_NEW_TASK_FAILURE, error}
};
export const addTaskToUserTasksTable = (task) => {
return async (dispatch) => {
dispatch(addTaskToUserTasksTableRequest());
try {
await axios.post("/tasks/users", task);
dispatch(addTaskToUserTasksTableSuccess())
dispatch(fetchAllTasksByMembership())
} catch (error) {
dispatch(addTaskToUserTasksTableFailure(error.response.data));
}
}
}
/** end */
\ No newline at end of file
planner-front/src/store/reducers/tasksReducer.js
View file @ 7e02a2b3
...@@ -17,7 +17,8 @@ import { ...@@ -17,7 +17,8 @@ import {
FETCH_TASKS_BY_PROJECT_FAILURE, FETCH_TASKS_BY_PROJECT_FAILURE,
DELETE_DATETIMETASK_FAILURE, DELETE_DATETIMETASK_FAILURE,
DELETE_DATETIMETASK_SUCCESS, DELETE_DATETIMETASK_SUCCESS,
DELETE_DATETIMETASK_REQUEST DELETE_DATETIMETASK_REQUEST,
FETCH_ALL_TASKS_BY_MEMBERSHIP_SUCCESS
} from "../actionTypes/tasksTypes"; } from "../actionTypes/tasksTypes";
const initialState = { const initialState = {
...@@ -77,7 +78,9 @@ const tasksReduсer = (state = initialState, action) => { ...@@ -77,7 +78,9 @@ const tasksReduсer = (state = initialState, action) => {
}) })
return {...state, loading: false, calendarTasks: newTasksWithInfoForCell}; return {...state, loading: false, calendarTasks: newTasksWithInfoForCell};
case FETCH_ALL_TASKS_SUCCESS: case FETCH_ALL_TASKS_SUCCESS:
return {...state, loading: false, tasks: action.tasks}; return {...state, loading: false, tasks: action.tasks, projects:action.projects};
case FETCH_ALL_TASKS_BY_MEMBERSHIP_SUCCESS:
return {...state, loading: false, tasks: action.tasks, projects:action.projects};
case FETCH_CALENDAR_TASKS_FAILURE: case FETCH_CALENDAR_TASKS_FAILURE:
return {...state, loading: false, error: action.error}; return {...state, loading: false, error: action.error};
case ADD_NEW_TASK_SUCCESS: case ADD_NEW_TASK_SUCCESS:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment