Fix kg per week/month for exercise progress graphs and remove useless formula
This commit is contained in:
@@ -49,7 +49,7 @@
|
||||
<h4 class="text-l font-semibold text-blue-400 text-center">{{ title }}</h4>
|
||||
<h2 class="text-xs font-semibold text-blue-200 mb-1 text-center" style='font-family: "Computer Modern Sans", sans-serif;'>
|
||||
{% if best_fit_formula %}
|
||||
y = {{ best_fit_formula.slope }}x {% if best_fit_formula.intercept != 0 %}+ {{ best_fit_formula.intercept }}{% endif %}, {{ best_fit_formula.kg_per_week }} kg/week, {{ best_fit_formula.kg_per_month }} kg/month
|
||||
{{ best_fit_formula.kg_per_week }} kg/week, {{ best_fit_formula.kg_per_month }} kg/month
|
||||
{% endif %}
|
||||
</h2>
|
||||
<div class="inline-flex rounded-md shadow-sm w-full items-center justify-center mb-1">
|
||||
|
||||
4
utils.py
4
utils.py
@@ -279,11 +279,9 @@ def get_exercise_graph_model(title, estimated_1rm, repetitions, weight, start_da
|
||||
best_fit_points = list(zip(y_best_fit, relative_positions))
|
||||
|
||||
# Convert the slope from scaled units per day to kg per day
|
||||
slope_kg_per_day = m * (max_e1rm - min_e1rm) / total_span
|
||||
slope_kg_per_day = (max_e1rm - min_e1rm) / total_span
|
||||
|
||||
best_fit_formula = {
|
||||
'slope': round(m,1),
|
||||
'intercept': round(b,1),
|
||||
'kg_per_week': round(slope_kg_per_day * 7, 1), # Convert to kg/week
|
||||
'kg_per_month': round(slope_kg_per_day * 30, 1) # Convert to kg/month
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user