Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenDAS
nni
Commits
8c8220e5
Unverified
Commit
8c8220e5
authored
Apr 20, 2020
by
Lijiaoa
Committed by
GitHub
Apr 20, 2020
Browse files
Overview concurrency tooltip (#2333)
parent
bcb53a72
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
6 deletions
+24
-6
src/webui/src/components/overview/Progress.tsx
src/webui/src/components/overview/Progress.tsx
+10
-4
src/webui/src/static/const.ts
src/webui/src/static/const.ts
+3
-1
src/webui/src/static/style/progress.scss
src/webui/src/static/style/progress.scss
+10
-0
src/webui/src/static/style/tableStatus.css
src/webui/src/static/style/tableStatus.css
+1
-1
No files found.
src/webui/src/components/overview/Progress.tsx
View file @
8c8220e5
import
*
as
React
from
'
react
'
;
import
*
as
React
from
'
react
'
;
import
{
Stack
,
Callout
,
Link
,
IconButton
,
FontWeights
,
mergeStyleSets
,
getId
,
getTheme
,
StackItem
}
from
'
office-ui-fabric-react
'
;
import
{
Stack
,
Callout
,
Link
,
IconButton
,
FontWeights
,
mergeStyleSets
,
getId
,
getTheme
,
StackItem
,
TooltipHost
}
from
'
office-ui-fabric-react
'
;
import
axios
from
'
axios
'
;
import
axios
from
'
axios
'
;
import
{
MANAGER_IP
}
from
'
../../static/const
'
;
import
{
MANAGER_IP
,
CONCURRENCYTOOLTIP
}
from
'
../../static/const
'
;
import
{
EXPERIMENT
,
TRIALS
}
from
'
../../static/datamodel
'
;
import
{
EXPERIMENT
,
TRIALS
}
from
'
../../static/datamodel
'
;
import
{
convertTime
}
from
'
../../static/function
'
;
import
{
convertTime
}
from
'
../../static/function
'
;
import
ConcurrencyInput
from
'
./NumInput
'
;
import
ConcurrencyInput
from
'
./NumInput
'
;
import
ProgressBar
from
'
./ProgressItem
'
;
import
ProgressBar
from
'
./ProgressItem
'
;
import
LogDrawer
from
'
../Modals/LogDrawer
'
;
import
LogDrawer
from
'
../Modals/LogDrawer
'
;
import
MessageInfo
from
'
../Modals/MessageInfo
'
;
import
MessageInfo
from
'
../Modals/MessageInfo
'
;
import
{
infoIcon
}
from
"
../Buttons/Icon
"
;
import
'
../../static/style/progress.scss
'
;
import
'
../../static/style/progress.scss
'
;
import
'
../../static/style/probar.scss
'
;
import
'
../../static/style/probar.scss
'
;
interface
ProgressProps
{
interface
ProgressProps
{
...
@@ -264,7 +268,9 @@ class Progressed extends React.Component<ProgressProps, ProgressState> {
...
@@ -264,7 +268,9 @@ class Progressed extends React.Component<ProgressProps, ProgressState> {
</
span
>
</
span
>
<
span
style
=
{
itemStyles
}
>
<
span
style
=
{
itemStyles
}
>
{
/* modify concurrency */
}
{
/* modify concurrency */
}
<
p
>
Concurrency
</
p
>
<
TooltipHost
content
=
{
CONCURRENCYTOOLTIP
}
>
<
p
className
=
"cursor"
>
Concurrency
<
span
className
=
"progress-info"
>
{
infoIcon
}
</
span
></
p
>
</
TooltipHost
>
<
ConcurrencyInput
value
=
{
this
.
props
.
concurrency
}
updateValue
=
{
this
.
editTrialConcurrency
}
/>
<
ConcurrencyInput
value
=
{
this
.
props
.
concurrency
}
updateValue
=
{
this
.
editTrialConcurrency
}
/>
</
span
>
</
span
>
<
span
style
=
{
itemStyles
}
className
=
"basic colorOfbasic"
></
span
>
<
span
style
=
{
itemStyles
}
className
=
"basic colorOfbasic"
></
span
>
...
...
src/webui/src/static/const.ts
View file @
8c8220e5
...
@@ -35,8 +35,10 @@ const COLUMN = ['Trial No.', 'ID', 'Duration', 'Status', 'Default', OPERATION];
...
@@ -35,8 +35,10 @@ const COLUMN = ['Trial No.', 'ID', 'Duration', 'Status', 'Default', OPERATION];
// all choice column !dictory final
// all choice column !dictory final
const
COLUMNPro
=
[
'
Trial No.
'
,
'
ID
'
,
'
Start Time
'
,
'
End Time
'
,
'
Duration
'
,
'
Status
'
,
const
COLUMNPro
=
[
'
Trial No.
'
,
'
ID
'
,
'
Start Time
'
,
'
End Time
'
,
'
Duration
'
,
'
Status
'
,
'
Intermediate result
'
,
'
Default
'
,
OPERATION
];
'
Intermediate result
'
,
'
Default
'
,
OPERATION
];
const
CONCURRENCYTOOLTIP
=
'
Trial concurrency is the number of trials running concurrently.
'
;
export
{
export
{
MANAGER_IP
,
DOWNLOAD_IP
,
trialJobStatus
,
COLUMNPro
,
WEBUIDOC
,
MANAGER_IP
,
DOWNLOAD_IP
,
trialJobStatus
,
COLUMNPro
,
WEBUIDOC
,
CONTROLTYPE
,
MONACO
,
COLUMN
,
DRAWEROPTION
,
OPERATION
,
CONTROLTYPE
,
MONACO
,
COLUMN
,
DRAWEROPTION
,
OPERATION
,
METRIC_GROUP_UPDATE_THRESHOLD
,
METRIC_GROUP_UPDATE_SIZE
,
METRIC_GROUP_UPDATE_THRESHOLD
,
METRIC_GROUP_UPDATE_SIZE
,
CONCURRENCYTOOLTIP
};
};
src/webui/src/static/style/progress.scss
View file @
8c8220e5
...
@@ -48,6 +48,12 @@
...
@@ -48,6 +48,12 @@
margin-left
:
6px
;
margin-left
:
6px
;
}
}
}
}
&
-info
{
margin-left
:
4px
;
position
:
relative
;
top
:
2px
;
}
}
}
/* basic experiment message style */
/* basic experiment message style */
...
@@ -101,3 +107,7 @@
...
@@ -101,3 +107,7 @@
border
:
2px
solid
#e6e6e6
;
border
:
2px
solid
#e6e6e6
;
border-radius
:
0
12px
12px
0
!
important
;
border-radius
:
0
12px
12px
0
!
important
;
}
}
.cursor
,
.cursor
:hover
{
cursor
:
pointer
;
}
\ No newline at end of file
src/webui/src/static/style/tableStatus.css
View file @
8c8220e5
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
color
:
#EB0716
;
color
:
#EB0716
;
}
}
.WAITING
{
.WAITING
{
color
:
#008B8B
;
color
:
#FDC401
;
}
}
.EARLY_STOPPED
{
.EARLY_STOPPED
{
color
:
#FFA500
;
color
:
#FFA500
;
...
...
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