Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ICAT
Datahub
Commits
16d94b25
Commit
16d94b25
authored
Jul 01, 2021
by
Marjolaine Bodin
Browse files
Merge remote-tracking branch 'origin/master' into issue_507-investigations_pagination
parents
5dee54d8
d8c2e4ed
Pipeline
#49660
passed with stage
in 4 minutes and 19 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/components/Logbook/EventFooter.js
View file @
16d94b25
...
...
@@ -13,7 +13,11 @@ import {
*/
class
EventFooter
extends
React
.
Component
{
render
()
{
const
{
cancelButtonLabel
,
isSaveButtonVisible
}
=
this
.
props
;
const
{
cancelButtonLabel
,
isSaveButtonVisible
,
loading
=
false
,
}
=
this
.
props
;
return
(
<
div
style
=
{{
position
:
'
relative
'
,
height
:
37
}}
>
...
...
@@ -37,6 +41,7 @@ class EventFooter extends React.Component {
<
Button
className
=
"
btn btn-primary
"
bsSize
=
"
small
"
disabled
=
{
loading
}
onClick
=
{()
=>
this
.
props
.
onSaveButtonClicked
()}
>
{
'
'
}
...
...
src/components/Logbook/NewOrEditEventPanel.js
View file @
16d94b25
...
...
@@ -262,6 +262,7 @@ function NewOrEditEventPanel(props) {
isSaveButtonEnabled
=
{
true
}
onCancelButtonClicked
=
{()
=>
onCancelButtonClicked
()}
onSaveButtonClicked
=
{()
=>
onSaveButtonClicked
()}
loading
=
{
loading
}
/
>
<
/div
>
<
/div
>
...
...
src/components/ManagerStats/GeneralStats/Logbook/LogbookInvestigationStatisticsPanel.js
View file @
16d94b25
...
...
@@ -78,13 +78,13 @@ function LogbookInvestigationStatisticsPanel(props) {
{
name
:
'
Annotations
'
,
value
:
`
${
annotationsCount
}
(
${
parseFloat
(
annotationsCount
/
total
(
annotationsCount
/
total
)
*
100
).
toFixed
(
2
)}
%)`
,
},
{
name
:
'
Notifications
'
,
value
:
`
${
notificationsCount
}
(
${
parseFloat
(
notificationsCount
/
total
(
notificationsCount
/
total
)
*
100
).
toFixed
(
2
)}
%)`
,
},
]}
...
...
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