Merge remote-tracking branch 'origin/master' into issue_507-investigations_pagination

src/components/Logbook/EventFooter.js

@@ -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

@@ -262,6 +262,7 @@ function NewOrEditEventPanel(props) {
             isSaveButtonEnabled={true}
             onCancelButtonClicked={() => onCancelButtonClicked()}
             onSaveButtonClicked={() => onSaveButtonClicked()}
+            loading={loading}
           />
         </div>
       </div>

src/components/ManagerStats/GeneralStats/Logbook/LogbookInvestigationStatisticsPanel.js

@@ -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)}%)`,
               },
             ]}