Merge branch 'master' into v0.2

2019-01-13 15:35:44 +01:00
parent 68f0d47b2f 012c83121d
commit 031d8da512
25 changed files with 558 additions and 480 deletions
--- a/fittrackee_client/src/components/Activity/ActivityDisplay/ActivityDetails.jsx
+++ b/fittrackee_client/src/components/Activity/ActivityDisplay/ActivityDetails.jsx
@ -13,15 +13,7 @@ export default function ActivityDetails(props) {
          className="fa fa-clock-o custom-fa"
          aria-hidden="true"
        />
-        Duration: {activity.duration}
-        {withPauses && (
-          <span>
-            {' '}
-            (pauses: {activity.pauses})
-            <br />
-            Moving duration: {activity.moving}
-          </span>
-        )}
+        Duration: {activity.moving}
        {recordLDexists && (
          <sup>
            <i
@ -30,6 +22,12 @@ export default function ActivityDetails(props) {
            />
          </sup>
        )}
+        {withPauses && (
+          <span>
+            <br />
+            (pauses: {activity.pauses}, total duration: {activity.duration})
+          </span>
+        )}
      </p>
      <p>
        <i