Commit 16d94b25 authored by Marjolaine Bodin's avatar 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
......@@ -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()}
>
{' '}
......
......@@ -262,6 +262,7 @@ function NewOrEditEventPanel(props) {
isSaveButtonEnabled={true}
onCancelButtonClicked={() => onCancelButtonClicked()}
onSaveButtonClicked={() => onSaveButtonClicked()}
loading={loading}
/>
</div>
</div>
......
......@@ -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)}%)`,
},
]}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment