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
1ac76af3
Commit
1ac76af3
authored
Dec 23, 2022
by
Евгений Положенцев
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'task-119-fix/tbl_zero_tasks' into 'development'
Task 119 fix/tbl zero tasks See merge request
!99
parents
99ebd86c
ecf3aeb3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
tasks.ts
planner-api/src/routers/tasks.ts
+0
-1
Select.js
planner-front/src/components/UI/Select/Select.js
+3
-1
TableRowTask.js
...ponents/UsersTasksCompoments/TableRowTask/TableRowTask.js
+2
-2
No files found.
planner-api/src/routers/tasks.ts
View file @
1ac76af3
...
@@ -27,7 +27,6 @@ router.get('/', async(req:Request, res:Response):Promise<Response> => {
...
@@ -27,7 +27,6 @@ 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
dateTimeDueFinal
=
dateTimeDue
let
dateTimeStartFinal
=
dateTimeStart
let
dateTimeStartFinal
=
dateTimeStart
let
dateTimeDeadlineFinal
=
dateTimeDeadLine
let
dateTimeDeadlineFinal
=
dateTimeDeadLine
...
...
planner-front/src/components/UI/Select/Select.js
View file @
1ac76af3
...
@@ -19,6 +19,7 @@ export default function BasicSelect({value,label,name,onChange,task,items}) {
...
@@ -19,6 +19,7 @@ export default function BasicSelect({value,label,name,onChange,task,items}) {
labelId
=
"demo-simple-select-label"
labelId
=
"demo-simple-select-label"
id
=
"demo-simple-select"
id
=
"demo-simple-select"
value
=
{
value
}
value
=
{
value
}
defaultValue
=
''
label
=
{
label
}
label
=
{
label
}
name
=
{
name
}
name
=
{
name
}
onChange
=
{(
e
)
=>
onChange
(
e
,
task
)}
onChange
=
{(
e
)
=>
onChange
(
e
,
task
)}
...
@@ -27,7 +28,8 @@ export default function BasicSelect({value,label,name,onChange,task,items}) {
...
@@ -27,7 +28,8 @@ export default function BasicSelect({value,label,name,onChange,task,items}) {
<
MenuItem
key
=
{
index
}
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/TableRowTask/TableRowTask.js
View file @
1ac76af3
...
@@ -192,7 +192,7 @@ const TableRowTask= ({
...
@@ -192,7 +192,7 @@ const TableRowTask= ({
onChange={onDateChange}
onChange={onDateChange}
user={user}
user={user}
/> */
}
/> */
}
<
TableCell
>
{
/* <TableCell> */
}
<
Tooltip
title
=
"Перейти в календарь"
>
<
Tooltip
title
=
"Перейти в календарь"
>
<
IconButton
<
IconButton
onClick
=
{(
id
)
=>
{
deleteHandle
(
task
.
id
);}}
onClick
=
{(
id
)
=>
{
deleteHandle
(
task
.
id
);}}
...
@@ -200,7 +200,7 @@ const TableRowTask= ({
...
@@ -200,7 +200,7 @@ const TableRowTask= ({
<
CalendarMonthIcon
/>
<
CalendarMonthIcon
/>
<
/IconButton
>
<
/IconButton
>
<
/Tooltip
>
<
/Tooltip
>
<
/TableCell
>
{
/* </TableCell> */
}
<
/TableCell
>
<
/TableCell
>
)
:
(
)
:
(
...
...
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