Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
nni
Commits
3833d986
Commit
3833d986
authored
Oct 16, 2018
by
Lijiao
Committed by
fishyds
Oct 16, 2018
Browse files
Format trial duration, rename button name (#209)
parent
b51c1562
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
3 deletions
+55
-3
src/webui/src/components/Para.tsx
src/webui/src/components/Para.tsx
+1
-1
src/webui/src/components/Sessionpro.tsx
src/webui/src/components/Sessionpro.tsx
+28
-1
src/webui/src/components/TrialStatus.tsx
src/webui/src/components/TrialStatus.tsx
+26
-1
No files found.
src/webui/src/components/Para.tsx
View file @
3833d986
...
@@ -445,7 +445,7 @@ class Para extends React.Component<{}, ParaState> {
...
@@ -445,7 +445,7 @@ class Para extends React.Component<{}, ParaState> {
className
=
"changeBtu"
className
=
"changeBtu"
onClick
=
{
this
.
swapBtn
}
onClick
=
{
this
.
swapBtn
}
>
>
sure
Confirm
</
Button
>
</
Button
>
</
div
>
</
div
>
</
div
>
</
div
>
...
...
src/webui/src/components/Sessionpro.tsx
View file @
3833d986
...
@@ -245,6 +245,23 @@ class Sessionpro extends React.Component<{}, SessionState> {
...
@@ -245,6 +245,23 @@ class Sessionpro extends React.Component<{}, SessionState> {
}
}
}
}
// trial's duration, accurate to seconds
convertDuration
=
(
num
:
number
)
=>
{
const
hour
=
Math
.
floor
(
num
/
3600
);
const
min
=
Math
.
floor
(
num
/
60
%
60
);
const
second
=
Math
.
floor
(
num
%
60
);
const
result
=
hour
>
0
?
`
${
hour
}
h
${
min
}
min
${
second
}
s`
:
`
${
min
}
min
${
second
}
s`
;
if
(
hour
<=
0
&&
min
===
0
&&
second
!==
0
)
{
return
`
${
second
}
s`
;
}
else
if
(
hour
===
0
&&
min
!==
0
&&
second
===
0
)
{
return
`
${
min
}
min`
;
}
else
if
(
hour
===
0
&&
min
!==
0
&&
second
!==
0
)
{
return
`
${
min
}
min
${
second
}
s`
;
}
else
{
return
result
;
}
}
downExperimentContent
=
()
=>
{
downExperimentContent
=
()
=>
{
axios
axios
.
all
([
.
all
([
...
@@ -321,7 +338,17 @@ class Sessionpro extends React.Component<{}, SessionState> {
...
@@ -321,7 +338,17 @@ class Sessionpro extends React.Component<{}, SessionState> {
title
:
'
Duration/s
'
,
title
:
'
Duration/s
'
,
dataIndex
:
'
duration
'
,
dataIndex
:
'
duration
'
,
key
:
'
duration
'
,
key
:
'
duration
'
,
width
:
'
9%
'
width
:
'
9%
'
,
sorter
:
(
a
:
TableObj
,
b
:
TableObj
)
=>
(
a
.
duration
as
number
)
-
(
b
.
duration
as
number
),
render
:
(
text
:
string
,
record
:
TableObj
)
=>
{
let
duration
;
if
(
record
.
duration
)
{
duration
=
this
.
convertDuration
(
record
.
duration
);
}
return
(
<
span
>
{
duration
}
</
span
>
);
},
},
{
},
{
title
:
'
Start
'
,
title
:
'
Start
'
,
dataIndex
:
'
start
'
,
dataIndex
:
'
start
'
,
...
...
src/webui/src/components/TrialStatus.tsx
View file @
3833d986
...
@@ -352,6 +352,22 @@ class TrialStatus extends React.Component<{}, TabState> {
...
@@ -352,6 +352,22 @@ class TrialStatus extends React.Component<{}, TabState> {
};
};
}
}
convertTime
=
(
num
:
number
)
=>
{
const
hour
=
Math
.
floor
(
num
/
3600
);
const
min
=
Math
.
floor
(
num
/
60
%
60
);
const
second
=
Math
.
floor
(
num
%
60
);
const
result
=
hour
>
0
?
`
${
hour
}
h
${
min
}
min
${
second
}
s`
:
`
${
min
}
min
${
second
}
s`
;
if
(
hour
<=
0
&&
min
===
0
&&
second
!==
0
)
{
return
`
${
second
}
s`
;
}
else
if
(
hour
===
0
&&
min
!==
0
&&
second
===
0
)
{
return
`
${
min
}
min`
;
}
else
if
(
hour
===
0
&&
min
!==
0
&&
second
!==
0
)
{
return
`
${
min
}
min
${
second
}
s`
;
}
else
{
return
result
;
}
}
componentDidMount
()
{
componentDidMount
()
{
this
.
_isMounted
=
true
;
this
.
_isMounted
=
true
;
...
@@ -394,7 +410,16 @@ class TrialStatus extends React.Component<{}, TabState> {
...
@@ -394,7 +410,16 @@ class TrialStatus extends React.Component<{}, TabState> {
key
:
'
duration
'
,
key
:
'
duration
'
,
width
:
'
10%
'
,
width
:
'
10%
'
,
// the sort of number
// the sort of number
sorter
:
(
a
:
TableObj
,
b
:
TableObj
)
=>
(
a
.
duration
as
number
)
-
(
b
.
duration
as
number
)
sorter
:
(
a
:
TableObj
,
b
:
TableObj
)
=>
(
a
.
duration
as
number
)
-
(
b
.
duration
as
number
),
render
:
(
text
:
string
,
record
:
TableObj
)
=>
{
let
duration
;
if
(
record
.
duration
)
{
duration
=
this
.
convertTime
(
record
.
duration
);
}
return
(
<
span
>
{
duration
}
</
span
>
);
},
},
{
},
{
title
:
'
Start
'
,
title
:
'
Start
'
,
dataIndex
:
'
start
'
,
dataIndex
:
'
start
'
,
...
...
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