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
814f9521
Commit
814f9521
authored
Nov 28, 2022
by
Нелли Ибрагимова
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
скорректировала вывод дат и времени под новый формат модели Таска
parent
e76b3f24
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
CustomTableCell.js
...front/src/components/MyTasksCompoments/CustomTableCell.js
+1
-1
MyTasks.js
planner-front/src/containers/MyTasks/MyTasks.js
+9
-9
No files found.
planner-front/src/components/MyTasksCompoments/CustomTableCell.js
View file @
814f9521
...
@@ -15,7 +15,7 @@ const CustomTableCell = ({task,
...
@@ -15,7 +15,7 @@ const CustomTableCell = ({task,
})
=>
{
})
=>
{
const
styles
=
{
width
:
"auto"
,
height
:
"10px"
};
const
styles
=
{
width
:
"auto"
,
height
:
"10px"
};
const
divStyle
=
{
display
:
"flex"
,
justifyContent
:
"space-between"
,
flexDirection
:
"column"
,
fontSize
:
"12px"
}
const
divStyle
=
{
display
:
"flex"
,
justifyContent
:
"space-between"
,
flexDirection
:
"column"
,
fontSize
:
"12px"
}
const
duration
=
moment
.
duration
(
moment
(
task
.
dateTime
Due
).
diff
(
moment
(
task
.
dateTimeStart
)));
const
duration
=
moment
.
duration
(
moment
(
task
.
dateTime
Tasks
[
0
]?.
dateTimeDue
).
diff
(
moment
(
task
.
dateTimeTasks
[
0
]?
.
dateTimeStart
)));
const
hours
=
Math
.
round
(
duration
.
asHours
());
const
hours
=
Math
.
round
(
duration
.
asHours
());
if
(
task
)
{
if
(
task
)
{
...
...
planner-front/src/containers/MyTasks/MyTasks.js
View file @
814f9521
...
@@ -377,21 +377,20 @@ console.log(tasks)
...
@@ -377,21 +377,20 @@ console.log(tasks)
{...{
{...{
task
,
task
,
name
:
"dateTimeStart"
,
name
:
"dateTimeStart"
,
value
:
moment
(
task
.
dateTime
Start
)
value
:
moment
(
task
.
dateTime
Tasks
[
0
]?.
dateTimeStart
)
.
utc
()
.
utc
()
.
format
(
"DD-MM-YYYY "
),
.
format
(
"DD-MM-YYYY "
),
value2
:
moment
(
task
.
dateTimeStart
)
value2
:
moment
(
task
.
dateTime
Tasks
[
0
]?.
dateTime
Start
)
.
utc
()
.
utc
()
.
format
(
"hh:mm A"
)
+
"-"
+
.
format
(
"hh:mm A"
)
+
"-"
+
moment
(
task
.
dateTimeDue
)
moment
(
task
.
dateTime
Tasks
[
0
]?.
dateTime
Due
)
.
utc
()
.
utc
()
.
format
(
"hh:mm A"
),
.
format
(
"hh:mm A"
),
user
:
user
user
:
user
}}
>
}}
>
<
span
>
"время завершения"
+
{
moment
(
task
.
dateTimeDue
)
{
/*
<span>"время завершения"+ {moment(task.dateTimeDue)
.utc()
.utc()
.
format
(
"hh:mm A"
)}
<
/span
>
.format("hh:mm A")}</span>
*/
}
<
/CustomTableCell
>
<
/CustomTableCell
>
<
/
>
<
/
>
...
@@ -419,8 +418,9 @@ console.log(tasks)
...
@@ -419,8 +418,9 @@ console.log(tasks)
<
CustomTableCell
<
CustomTableCell
{...{
{...{
task
,
task
,
name
:
"dateTimeDue"
,
name
:
"dateTimeDeadLine"
,
value
:
moment
(
task
.
dateTimeDue
)
value
:
moment
(
task
.
dateTimeDeadLine
)
.
utc
()
.
utc
()
.
format
(
"DD-MM-YYYY hh:mm A"
),
.
format
(
"DD-MM-YYYY hh:mm A"
),
user
:
user
user
:
user
...
...
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