From 066a05c57f7663318a100831aea499ab8a1ffad6 Mon Sep 17 00:00:00 2001
From: Sam <sam@samr1.net>
Date: Wed, 13 Jun 2018 18:52:39 +0200
Subject: [PATCH] Client: add notes to activities - fix 10

+ minor fix on weather
---
 .../migrations/versions/096dd0b43beb_.py        |  2 +-
 .../Activity/ActivityDisplay/ActivityNotes.jsx  | 15 +++++++++++++++
 .../ActivityDisplay/ActivityWeather.jsx         | 12 ++++++------
 .../Activity/ActivityDisplay/index.jsx          |  2 ++
 .../Activity/ActivityForms/FormWithGpx.jsx      | 17 ++++++++++++++++-
 .../Activity/ActivityForms/FormWithoutGpx.jsx   | 12 ++++++++++++
 fittrackee_client/src/components/App.css        |  7 +++++++
 7 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 fittrackee_client/src/components/Activity/ActivityDisplay/ActivityNotes.jsx

diff --git a/fittrackee_api/migrations/versions/096dd0b43beb_.py b/fittrackee_api/migrations/versions/096dd0b43beb_.py
index 3932f03c..4f580518 100644
--- a/fittrackee_api/migrations/versions/096dd0b43beb_.py
+++ b/fittrackee_api/migrations/versions/096dd0b43beb_.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add 'notes' column to 'Activity' table
 
 Revision ID: 096dd0b43beb
 Revises: 71093ac9ca44
diff --git a/fittrackee_client/src/components/Activity/ActivityDisplay/ActivityNotes.jsx b/fittrackee_client/src/components/Activity/ActivityDisplay/ActivityNotes.jsx
new file mode 100644
index 00000000..dcd629dc
--- /dev/null
+++ b/fittrackee_client/src/components/Activity/ActivityDisplay/ActivityNotes.jsx
@@ -0,0 +1,15 @@
+import React from 'react'
+
+export default function ActivityNotes(props) {
+  const { notes } = props
+  return (
+    <div className="card">
+      <div className="card-body">
+        Notes
+        <div className="activity-notes">
+          {notes ? notes : 'No notes'}
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/fittrackee_client/src/components/Activity/ActivityDisplay/ActivityWeather.jsx b/fittrackee_client/src/components/Activity/ActivityDisplay/ActivityWeather.jsx
index 170b38db..8e3bbe55 100644
--- a/fittrackee_client/src/components/Activity/ActivityDisplay/ActivityWeather.jsx
+++ b/fittrackee_client/src/components/Activity/ActivityDisplay/ActivityWeather.jsx
@@ -43,10 +43,10 @@ export default function ActivityWeather(props) {
                 />
               </td>
               <td>
-                {activity.weather_start.temperature}°C
+                {Number(activity.weather_start.temperature).toFixed(1)}°C
               </td>
               <td>
-                {activity.weather_end.temperature}°C
+                {Number(activity.weather_end.temperature).toFixed(1)}°C
               </td>
             </tr>
             <tr>
@@ -58,10 +58,10 @@ export default function ActivityWeather(props) {
                 />
               </td>
               <td>
-                {activity.weather_start.humidity * 100}%
+                {Number(activity.weather_start.humidity * 100).toFixed(1)}%
               </td>
               <td>
-                {activity.weather_end.humidity * 100}%
+                {Number(activity.weather_end.humidity * 100).toFixed(1)}%
               </td>
             </tr>
             <tr>
@@ -73,10 +73,10 @@ export default function ActivityWeather(props) {
                 />
               </td>
               <td>
-                {activity.weather_start.wind}m/s
+                {Number(activity.weather_start.wind).toFixed(1)}m/s
               </td>
               <td>
-                {activity.weather_end.wind}m/s
+                {Number(activity.weather_end.wind).toFixed(1)}m/s
               </td>
             </tr>
           </tbody>
diff --git a/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx b/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
index eb8f1c97..fc10f852 100644
--- a/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
+++ b/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
@@ -6,6 +6,7 @@ import ActivityCardHeader from './ActivityCardHeader'
 import ActivityCharts from './ActivityCharts'
 import ActivityDetails from './ActivityDetails'
 import ActivityMap from './ActivityMap'
+import ActivityNotes from './ActivityNotes'
 import CustomModal from './../../Others/CustomModal'
 import { getOrUpdateData } from '../../../actions'
 import { deleteActivity } from '../../../actions/activities'
@@ -106,6 +107,7 @@ class ActivityDisplay extends React.Component {
                     </div>
                   </div>
                 )}
+                <ActivityNotes notes={activity.notes} />
               </div>
             )}
           </div>
diff --git a/fittrackee_client/src/components/Activity/ActivityForms/FormWithGpx.jsx b/fittrackee_client/src/components/Activity/ActivityForms/FormWithGpx.jsx
index a30b3327..0eeeea3a 100644
--- a/fittrackee_client/src/components/Activity/ActivityForms/FormWithGpx.jsx
+++ b/fittrackee_client/src/components/Activity/ActivityForms/FormWithGpx.jsx
@@ -64,6 +64,18 @@ function FormWithGpx (props) {
           </label>
         </div>
       )}
+      <div className="form-group">
+        <label>
+          Notes:
+          <textarea
+            name="notes"
+            defaultValue={activity ? activity.notes : ''}
+            disabled={loading}
+            className="form-control input-lg"
+            maxLength="500"
+          />
+        </label>
+      </div>
       {loading ? (
         <div className="loader" />
       ) : (
@@ -100,13 +112,16 @@ export default connect(
       const form = new FormData()
       form.append('file', e.target.form.gpxFile.files[0])
       form.append(
-        'data', `{"sport_id": ${e.target.form.sport.value}}`
+        'data',
+        `{"sport_id": ${e.target.form.sport.value
+        }, "notes": "${e.target.form.notes.value}"}`
       )
       dispatch(addActivity(form))
     },
     onEditActivity: (e, activity) => {
       dispatch(editActivity({
         id: activity.id,
+        notes: e.target.form.notes.value,
         sport_id: +e.target.form.sport.value,
         title: e.target.form.title.value,
       }))
diff --git a/fittrackee_client/src/components/Activity/ActivityForms/FormWithoutGpx.jsx b/fittrackee_client/src/components/Activity/ActivityForms/FormWithoutGpx.jsx
index bbc1a941..4d42c397 100644
--- a/fittrackee_client/src/components/Activity/ActivityForms/FormWithoutGpx.jsx
+++ b/fittrackee_client/src/components/Activity/ActivityForms/FormWithoutGpx.jsx
@@ -103,6 +103,17 @@ function FormWithoutGpx (props) {
           />
         </label>
       </div>
+      <div className="form-group">
+        <label>
+          Notes:
+          <textarea
+            name="notes"
+            defaultValue={activity ? activity.notes : ''}
+            className="form-control input-lg"
+            maxLength="500"
+          />
+        </label>
+      </div>
       <input
         type="submit"
         className="btn btn-primary btn-lg btn-block"
@@ -133,6 +144,7 @@ export default connect(
         activity_date: activityDate,
         distance: +e.target.form.distance.value,
         duration,
+        notes: e.target.form.notes.value,
         sport_id: +e.target.form.sport_id.value,
         title: e.target.form.title.value,
       }
diff --git a/fittrackee_client/src/components/App.css b/fittrackee_client/src/components/App.css
index 68472b79..dffd7db9 100644
--- a/fittrackee_client/src/components/App.css
+++ b/fittrackee_client/src/components/App.css
@@ -72,6 +72,13 @@ label {
   padding: 0;
 }
 
+.activity-notes {
+  font-size: 0.9em;
+  font-style: italic;
+  margin-top: 10px;
+  padding: 5px;
+}
+
 .activity-page {
   margin-top: 20px;
 }