Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
planner-team-one
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
21
Issues
21
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Евгений Положенцев
planner-team-one
Commits
51db4527
Commit
51db4527
authored
Dec 07, 2022
by
Евгений Положенцев
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#90
added taskcopyTypes and remove of edit copytask option in my tasks
parent
85008743
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
copyTasks.ts
planner-api/src/routers/copyTasks.ts
+4
-3
TableRowTask.js
...components/MyTasksCompoments/TableRowTask/TableRowTask.js
+3
-3
tasksTypes.js
planner-front/src/store/actionTypes/tasksTypes.js
+5
-1
No files found.
planner-api/src/routers/copyTasks.ts
View file @
51db4527
...
@@ -41,8 +41,9 @@ router.post("/make-copy", async(req:Request, res:Response):Promise<Response>=>{
...
@@ -41,8 +41,9 @@ router.post("/make-copy", async(req:Request, res:Response):Promise<Response>=>{
}
)
}
)
/** change date time of copy of task in calendar view */
/** change date time of copy of task in calendar view */
router
.
put
(
"/change-copy"
,
authAuthorOrExecutorOfTask
,
async
(
req
:
Request
,
res
:
Response
):
Promise
<
Response
>=>
{
router
.
put
(
"/change-copy/:dateTimeTaskId"
,
authAuthorOrExecutorOfTask
,
async
(
req
:
Request
,
res
:
Response
):
Promise
<
Response
>=>
{
const
{
executorStatus
,
dateTimeTaskId
,
taskId
,
dateTimeStart
,
dateTimeDue
,
description
,
title
,
priority
}
=
req
.
body
const
{
dateTimeTaskId
}
=
req
.
params
const
{
executorStatus
,
taskId
,
dateTimeStart
,
dateTimeDue
,
description
,
title
,
priority
}
=
req
.
body
const
dateTimeTask
=
await
dataSource
const
dateTimeTask
=
await
dataSource
.
createQueryBuilder
()
.
createQueryBuilder
()
.
select
(
'dateTimeTask'
)
.
select
(
'dateTimeTask'
)
...
@@ -55,7 +56,7 @@ router.put("/change-copy", authAuthorOrExecutorOfTask, async(req:Request, res: R
...
@@ -55,7 +56,7 @@ router.put("/change-copy", authAuthorOrExecutorOfTask, async(req:Request, res: R
await
dateTimeTask
.
save
()
await
dateTimeTask
.
save
()
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'
})
task
.
title
=
title
;
task
.
title
=
title
;
task
.
description
=
description
;
task
.
description
=
description
;
task
.
priority
=
priority
;
task
.
priority
=
priority
;
await
task
.
save
()
await
task
.
save
()
...
...
planner-front/src/components/MyTasksCompoments/TableRowTask/TableRowTask.js
View file @
51db4527
...
@@ -31,7 +31,7 @@ const TableRowTask= ({
...
@@ -31,7 +31,7 @@ const TableRowTask= ({
deleteHandle
,
deleteHandle
,
handleEditTask
,
handleEditTask
,
deleteDateTimeTask
,
deleteDateTimeTask
,
handleEditDateTimeTask
,
//
handleEditDateTimeTask,
onChange
,
onChange
,
onModalOpen
,
onModalOpen
,
onProjectChange
,
onProjectChange
,
...
@@ -339,7 +339,7 @@ const TableRowTask= ({
...
@@ -339,7 +339,7 @@ const TableRowTask= ({
<
/TableCell
>
<
/TableCell
>
{
/* Edit option datetimeTask */
}
{
/* Edit option datetimeTask */
}
<
TableCell
style
=
{{
width
:
'0%'
}}
>
{
/*
<TableCell style={{width:'0%'}}>
<Tooltip title="Редактировать Копию">
<Tooltip title="Редактировать Копию">
{task.isEditMode ? (
{task.isEditMode ? (
<IconButton
<IconButton
...
@@ -360,7 +360,7 @@ const TableRowTask= ({
...
@@ -360,7 +360,7 @@ const TableRowTask= ({
</IconButton>
</IconButton>
)}
)}
</Tooltip>
</Tooltip>
<
/TableCell
>
</TableCell >
*/
}
{
/* delete option datetimeTask */
}
{
/* delete option datetimeTask */
}
{
task
.
author
.
id
===
user
.
id
?
{
task
.
author
.
id
===
user
.
id
?
...
...
planner-front/src/store/actionTypes/tasksTypes.js
View file @
51db4527
...
@@ -20,4 +20,8 @@ export const DELETE_TASK_REQUEST = "DELETE_TASK_REQUEST";
...
@@ -20,4 +20,8 @@ export const DELETE_TASK_REQUEST = "DELETE_TASK_REQUEST";
export
const
DELETE_TASK_SUCCESS
=
"DELETE_TASK_SUCCESS"
;
export
const
DELETE_TASK_SUCCESS
=
"DELETE_TASK_SUCCESS"
;
export
const
DELETE_TASK_FAILURE
=
"DELETE_TASK_FAILURE"
;
export
const
DELETE_TASK_FAILURE
=
"DELETE_TASK_FAILURE"
;
export
const
EDIT_CALENDAR_TASK
=
"EDIT_CALENDAR_TASK"
;
export
const
EDIT_CALENDAR_TASK
=
"EDIT_CALENDAR_TASK"
;
\ No newline at end of file
export
const
DELETE_COPYTASK_REQUEST
=
"DELETE_TASK_REQUEST"
;
export
const
DELETE_COPYTASK_SUCCESS
=
"DELETE_TASK_SUCCESS"
;
export
const
DELETE_COPYTASK_FAILURE
=
"DELETE_TASK_FAILURE"
;
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment