github/endurain
1
1
Fork 0
mirror of https://github.com/joaovitoriasilva/endurain.git synced 2026-01-10 16:28:00 -05:00
Code Issues 45 Packages Projects Releases Wiki Activity

Fixed activity summary issues

Browse Source 
[backend] removed unnecessary print
[backend] fixed location_data logic on .fit processing
[frontend] fixed small issues on activity summary
This commit is contained in:
João Vitória Silva
2024-11-18 12:28:17 +00:00
parent 791f80a356
commit c1b850c8eb
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/app/fit/utils.py
View File

@@ -204,16 +204,16 @@ def split_records_by_activity(parsed_data: dict) -> dict:
i
]["lat_lon_waypoints"][0]["lon"]
# Use geocoding API to get city, town, and country based on coordinates
location_data = activities_utils.location_based_on_coordinates(
session["initial_latitude"], session["initial_longitude"]
)
# Use geocoding API to get city, town, and country based on coordinates
location_data = activities_utils.location_based_on_coordinates(
session["initial_latitude"], session["initial_longitude"]
)
# Extract city, town, and country from location data
if location_data:
parsed_session["session"]["city"] = location_data["city"]
parsed_session["session"]["town"] = location_data["town"]
parsed_session["session"]["country"] = location_data["country"]
# Extract city, town, and country from location data
if location_data:
parsed_session["session"]["city"] = location_data["city"]
parsed_session["session"]["town"] = location_data["town"]
parsed_session["session"]["country"] = location_data["country"]
if is_elevation_set:
activity_waypoints[i]["ele_waypoints"] = [

1
backend/app/gears/crud.py
View File

@@ -288,7 +288,6 @@ def edit_gear(gear_id: int, gear: gears_schema.Gear, db: Session):
if gear.created_at is not None:
db_gear.created_at = gear.created_at
if gear.is_active is not None:
print(f"Gear is active value: {gear.is_active}")
db_gear.is_active = gear.is_active
if gear.strava_gear_id is not None:
db_gear.strava_gear_id = gear.strava_gear_id

25
frontend/app/src/components/Activities/ActivitySummaryComponent.vue
View File

@@ -31,43 +31,44 @@
<!-- Display the activity type -->
<span v-if="activity.activity_type == 1 || activity.activity_type == 2">
<font-awesome-icon :icon="['fas', 'person-running']" />
<font-awesome-icon class="me-1" :icon="['fas', 'person-running']" />
</span>
<span v-else-if="activity.activity_type == 3">
<font-awesome-icon :icon="['fas', 'person-running']" /> (Virtual)
<font-awesome-icon class="me-1" :icon="['fas', 'person-running']" />(Virtual)
</span>
<span v-else-if="activity.activity_type == 4 || activity.activity_type == 5 || activity.activity_type == 6">
<font-awesome-icon :icon="['fas', 'fa-person-biking']" />
<font-awesome-icon class="me-1" :icon="['fas', 'fa-person-biking']" />
</span>
<span v-else-if="activity.activity_type == 7">
<font-awesome-icon :icon="['fas', 'fa-person-biking']" /> (Virtual)
<font-awesome-icon class="me-1" :icon="['fas', 'fa-person-biking']" />(Virtual)
</span>
<span v-else-if="activity.activity_type == 8 || activity.activity_type == 9">
<font-awesome-icon :icon="['fas', 'fa-person-swimming']" />
<font-awesome-icon class="me-1" :icon="['fas', 'fa-person-swimming']" />
</span>
<span v-else-if="activity.activity_type == 11">
<font-awesome-icon :icon="['fas', 'person-walking']" />
<font-awesome-icon class="me-1" :icon="['fas', 'person-walking']" />
</span>
<span v-else-if="activity.activity_type == 12">
<font-awesome-icon :icon="['fas', 'person-hiking']" />
<font-awesome-icon class="me-1" :icon="['fas', 'person-hiking']" />
</span>
<span v-else-if="activity.activity_type == 13">
<font-awesome-icon :icon="['fas', 'sailboat']" />
<font-awesome-icon class="me-1" :icon="['fas', 'sailboat']" />
</span>
<span v-else-if="activity.activity_type == 14">
<font-awesome-icon :icon="['fas', 'hands-praying']" />
<font-awesome-icon class="me-1" :icon="['fas', 'hands-praying']" />
</span>
<span v-else>
<font-awesome-icon :icon="['fas', 'fa-dumbbell']" />
<font-awesome-icon class="me-1" :icon="['fas', 'fa-dumbbell']" />
</span>
<!-- Display the date and time -->
<span class="ms-1">{{ formatDate(activity.start_time) }}</span> @
<span>{{ formatDate(activity.start_time) }}</span> @
<span>{{ formatTime(activity.start_time) }}</span>
<!-- Conditionally display city and country -->
<span v-if="activity.city || activity.country">
<span v-if="activity.town || activity.city || activity.country">
-
<span v-if="activity.town">{{ activity.town }},</span>
<span v-else-if="activity.city">{{ activity.city }},</span>
<span v-if="activity.country">{{ " " + activity.country }}</span>
</span>
</h6>