Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API & Client: add max speed in filters

Browse Source
This commit is contained in:
Sam
2018-06-11 22:42:04 +02:00
parent 941c9958f9
commit 5d749f3f47
8 changed files with 83 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fittrackee_client/src/components/Activities/ActivitiesFilter.jsx
View File

@ -133,6 +133,36 @@ export default function ActivitiesList (props) {
</div>
</label>
</div>
<div className="form-group">
<label>
Max speed (km/h):
<div className="container">
<div className="row">
<div className="col-5">
<input
className="form-control"
min={0}
name="max_speed_from"
onChange={e => updateParams(e)}
step="1"
type="number"
/>
</div>
<div className="col-2 align-middle text-center">to</div>
<div className="col-5">
<input
className="form-control"
min={0}
name="max_speed_to"
onChange={e => updateParams(e)}
step="1"
type="number"
/>
</div>
</div>
</div>
</label>
</div>
<input
className="btn btn-primary btn-lg btn-block"
onClick={() => loadActivities()}

4
fittrackee_client/src/components/Activities/ActivitiesList.jsx
View File

@ -7,7 +7,7 @@ import { getDateWithTZ } from '../../utils'
export default function ActivitiesList (props) {
const { activities, sports, user } = props
return (
<div className="card">
<div className="card activity-card">
<div className="card-body">
<table className="table">
<thead>
@ -18,6 +18,7 @@ export default function ActivitiesList (props) {
<th scope="col">Distance</th>
<th scope="col">Duration</th>
<th scope="col">Ave. speed</th>
<th scope="col">Max. speed</th>
</tr>
</thead>
<tbody>
@ -49,6 +50,7 @@ export default function ActivitiesList (props) {
</td>
<td className="text-right">{activity.duration}</td>
<td className="text-right">{activity.ave_speed} km/h</td>
<td className="text-right">{activity.max_speed} km/h</td>
</tr>
))}
</tbody>

2
fittrackee_client/src/components/Activities/index.jsx
View File

@ -59,7 +59,7 @@ class Activities extends React.Component {
updateParams={e => this.setParams(e)}
/>
</div>
<div className="col-md-9">
<div className="col-md-9 activities-result">
<ActivitiesList
activities={activities}
sports={sports}

4
fittrackee_client/src/components/App.css
View File

@ -83,6 +83,10 @@ input, textarea {
margin-top: 20px;
}
.activities-result {
font-size: 0.9em;
}
.activity-sport {
margin-right: 1px;
max-width: 20px;

4
fittrackee_client/src/components/Dashboard/Records.jsx
View File

@ -48,10 +48,10 @@ export default function RecordsCard (props) {
<td>
{rec.record_type}
</td>
<td>
<td className="text-right">
{rec.value}
</td>
<td>
<td className="text-right">
<Link to={`/activities/${rec.activity_id}`}>
{rec.activity_date}
</Link>