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

API & Client: fix

Browse Source
This commit is contained in:
Sam
2018-06-07 22:44:52 +02:00
parent 76b2d5aad2
commit e7e0a20f89
10 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fittrackee_api/fittrackee_api/activities/activities.py
View File

@ -1,7 +1,7 @@
import json
import os
import shutil
from datetime import datetime
from datetime import datetime, timedelta
from fittrackee_api import appLog, db
from flask import Blueprint, current_app, jsonify, request, send_file
@ -41,8 +41,9 @@ def get_activities(auth_user_id):
Activity.sport_id == sport_id if sport_id else True,
Activity.activity_date >= datetime.strptime(date_from, '%Y-%m-%d')
if date_from else True,
Activity.activity_date <= datetime.strptime(date_to, '%Y-%m-%d')
if date_to else True,
Activity.activity_date < (
datetime.strptime(date_to, '%Y-%m-%d') + timedelta(days=1)
) if date_to else True,
Activity.distance >= int(distance_from) if distance_from else True,
Activity.distance <= int(distance_to) if distance_to else True,
Activity.duration >= convert_in_duration(duration_from)

5
fittrackee_api/fittrackee_api/activities/stats.py
View File

@ -43,8 +43,9 @@ def get_activities(user_id, type):
Activity.user_id == user_id,
Activity.activity_date >= datetime.strptime(date_from, '%Y-%m-%d')
if date_from else True,
Activity.activity_date <= datetime.strptime(date_to, '%Y-%m-%d')
if date_to else True,
Activity.activity_date < (
datetime.strptime(date_to, '%Y-%m-%d') + timedelta(days=1)
) if date_to else True,
Activity.sport_id == sport_id if sport_id else True,
).order_by(
Activity.activity_date.asc()

21
fittrackee_api/fittrackee_api/users/models.py
View File

@ -87,15 +87,18 @@ class User(db.Model):
nb_activity = Activity.query.filter(
Activity.user_id == self.id
).count()
sports = db.session.query(
func.count(Activity.sport_id)
).group_by(
Activity.sport_id
).all()
total = db.session.query(
func.sum(Activity.distance),
func.sum(Activity.duration)
).first()
sports = []
total = (None, None)
if nb_activity > 0:
sports = db.session.query(
func.count(Activity.sport_id)
).group_by(
Activity.sport_id
).all()
total = db.session.query(
func.sum(Activity.distance),
func.sum(Activity.duration)
).first()
return {
'id': self.id,
'username': self.username,