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

Refactor time calculation for heart rate zones and update display logic in activity components

Browse Source
This commit is contained in:
Boris Stäheli
2025-12-13 23:19:46 +01:00
parent 317922d416
commit 6b6a6fdf53
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/app/activities/activity_streams/crud.py
View File

@@ -425,14 +425,13 @@ def transform_activity_streams_hr(activity_stream, activity, db):
] ]
zone_percentages = [round((count / total) * 100, 2) for count in zone_counts] zone_percentages = [round((count / total) * 100, 2) for count in zone_counts]
# Calculate time in seconds for each zone # Calculate time in seconds for each zone using the percentage of total_timer_time
# Use the same logic as percentage: distribute total_timer_time based on waypoint ratio if hasattr(activity, 'total_timer_time') and activity.total_timer_time:
if hasattr(activity, 'total_timer_time') and activity.total_timer_time and total > 0:
total_time_seconds = activity.total_timer_time total_time_seconds = activity.total_timer_time
zone_time_seconds = [int((count / total) * total_time_seconds) for count in zone_counts] zone_time_seconds = [int((percent / 100) * total_time_seconds) for percent in zone_percentages]
else: else:
# Fallback: assume waypoints represent equal time intervals # Fallback: no time calculation possible without total_timer_time
zone_time_seconds = [int(count) for count in zone_counts] zone_time_seconds = [0, 0, 0, 0, 0]
# Calculate zone HR boundaries for display # Calculate zone HR boundaries for display
zone_hr = { zone_hr = {

3
frontend/app/src/components/Activities/ActivityBellowMPillsComponent.vue
View File

@@ -145,6 +145,9 @@
:datalabelsFormatter=" :datalabelsFormatter="
(value, context) => { (value, context) => {
const timeSeconds = getHrBarChartData(hrZones, t).timeSeconds[context.dataIndex] const timeSeconds = getHrBarChartData(hrZones, t).timeSeconds[context.dataIndex]
if (!timeSeconds || timeSeconds === 0) {
return `${Math.round(value)}%`
}
const hours = Math.floor(timeSeconds / 3600) const hours = Math.floor(timeSeconds / 3600)
const minutes = Math.floor((timeSeconds % 3600) / 60) const minutes = Math.floor((timeSeconds % 3600) / 60)
const timeStr = hours > 0 ? `${hours}h ${minutes}m` : `${minutes}m` const timeStr = hours > 0 ? `${hours}h ${minutes}m` : `${minutes}m`

3
frontend/app/src/components/Activities/ActivityMandAbovePillsComponent.vue
View File

@@ -127,6 +127,9 @@
:datalabelsFormatter=" :datalabelsFormatter="
(value, context) => { (value, context) => {
const timeSeconds = getHrBarChartData(hrZones, t).timeSeconds[context.dataIndex] const timeSeconds = getHrBarChartData(hrZones, t).timeSeconds[context.dataIndex]
if (!timeSeconds || timeSeconds === 0) {
return `${Math.round(value)}%`
}
const hours = Math.floor(timeSeconds / 3600) const hours = Math.floor(timeSeconds / 3600)
const minutes = Math.floor((timeSeconds % 3600) / 60) const minutes = Math.floor((timeSeconds % 3600) / 60)
const timeStr = hours > 0 ? `${hours}h ${minutes}m` : `${minutes}m` const timeStr = hours > 0 ? `${hours}h ${minutes}m` : `${minutes}m`