Improve users and workouts overview page WIP
This commit is contained in:
Peter Stockings
38
app.py
38
app.py
@@ -1,5 +1,5 @@
|
||||
from sqlalchemy import func
|
||||
from datetime import timedelta
|
||||
from datetime import datetime, timedelta
|
||||
import io
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
from flask import Flask, make_response, render_template, request, jsonify
|
||||
@@ -8,6 +8,7 @@ from flask_htmx import HTMX
|
||||
import matplotlib.pyplot as plt
|
||||
import matplotlib.dates as mdates
|
||||
import os
|
||||
import sparklines
|
||||
|
||||
|
||||
app = Flask(__name__)
|
||||
@@ -165,7 +166,7 @@ def view_workout(user_id, workout_id):
|
||||
|
||||
|
||||
@app.route('/user/<int:user_id>/workout/<int:workout_id>/delete', methods=['DELETE'])
|
||||
def delete_workout(user_io, workout_id):
|
||||
def delete_workout(user_id, workout_id):
|
||||
# Delete the workout and its associated cadence readings
|
||||
CadenceReading.query.filter_by(workout_id=workout_id).delete()
|
||||
db.session.delete(workout)
|
||||
@@ -198,12 +199,41 @@ def render_users_and_workouts():
|
||||
users_data = []
|
||||
for user in users:
|
||||
workouts = get_workouts_for_user(user.id)
|
||||
workout_counts_by_week = []
|
||||
duration_by_week = []
|
||||
# get start date from last workout
|
||||
start_date = workouts[-1]['start_time_date'].date()
|
||||
# get end date from first workout
|
||||
end_date = workouts[0]['start_time_date'].date()
|
||||
# calculate number of weeks between start and end date
|
||||
num_weeks = (end_date - start_date).days // 7 + 1
|
||||
|
||||
for i in range(num_weeks):
|
||||
# Calculate the start and end of the current week
|
||||
start = start_date + timedelta(days=7*i)
|
||||
end = start + timedelta(days=6)
|
||||
|
||||
# Get the workouts for the current week
|
||||
weekly_workouts = [w for w in workouts if start <=
|
||||
w['start_time_date'].date() <= end]
|
||||
|
||||
# Calculate the workout counts and duration for the current week
|
||||
workout_counts_by_week.append(len(weekly_workouts))
|
||||
duration_by_week.append(
|
||||
int(sum([int(w['duration_minutes']) for w in weekly_workouts]))/len(weekly_workouts))
|
||||
|
||||
workout_counts_sparkline = sparklines.sparklines(
|
||||
workout_counts_by_week)
|
||||
duration_sparkline = sparklines.sparklines(duration_by_week)
|
||||
|
||||
user_data = {
|
||||
'id': user.id,
|
||||
'name': user.name,
|
||||
'bike_id': user.bike_id,
|
||||
'workouts_count': len(workouts),
|
||||
'workouts': workouts
|
||||
'workouts': workouts,
|
||||
'workout_counts_by_week': workout_counts_by_week,
|
||||
'duration_by_week': duration_by_week
|
||||
}
|
||||
users_data.append(user_data)
|
||||
return render_template('users_and_workouts.html', users=users_data, bikes=Bike.query.all())
|
||||
@@ -230,7 +260,9 @@ def get_workouts_for_user(user_id):
|
||||
'id': workout.id,
|
||||
'user_id': user_id,
|
||||
'start_time': format_date_with_ordinal(start_time, '%#H:%M %B %dth %Y'),
|
||||
'start_time_date': start_time,
|
||||
'duration': format_duration(duration),
|
||||
'duration_minutes': duration.total_seconds() / 60,
|
||||
'average_rpm': int(average_rpm),
|
||||
'calories': int(calories),
|
||||
'distance': int(distance)
|
||||
|
||||
@@ -7,4 +7,5 @@ flask-htmx==0.2.0
|
||||
python-dateutil==2.8.2
|
||||
bidict==0.22.1
|
||||
Flask-SQLAlchemy==3.0.3
|
||||
matplotlib==3.5.2
|
||||
matplotlib==3.5.2
|
||||
sparklines==0.4.2
|
||||
@@ -1,83 +1,5 @@
|
||||
<table class="w-full">
|
||||
<thead>
|
||||
<tr class="bg-gray-200 text-gray-600 uppercase text-sm leading-normal">
|
||||
<th class="py-3 px-6 text-left">Name</th>
|
||||
<th class="py-3 px-6 text-left">Bike</th>
|
||||
<th class="py-3 px-6 text-left"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for u in users %}
|
||||
<tr class="hover:bg-gray-100">
|
||||
<td class="py-4 px-6 border-b border-gray-200">
|
||||
<a href="{{ url_for('new_workout', user_id=u.id) }}">
|
||||
<div class="flex">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
|
||||
stroke="currentColor" class="w-6 h-6 pr-2" data-darkreader-inline-stroke=""
|
||||
style="--darkreader-inline-stroke:currentColor;">
|
||||
<path stroke-linecap="round" stroke-linejoin="round"
|
||||
d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z">
|
||||
</path>
|
||||
</svg>
|
||||
|
||||
<div class="flex">
|
||||
<p>{{ u.name }}</p>
|
||||
<p class="ml-1 prose-sm">({{ u.workouts_count }})</p>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</td>
|
||||
<td class="py-2 px-6 border-b border-gray-200">
|
||||
<div class="relative">
|
||||
<select
|
||||
class="block appearance-none w-full bg-gray-200 border border-gray-200 text-gray-700 py-3 px-4 pr-8 rounded leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
|
||||
id="grid-state" name="bike_id" required
|
||||
hx-get="{{ url_for('update_users_bike', user_id=u.id) }}" hx-target="#users-container">
|
||||
{% for b in bikes %}
|
||||
<option value="{{ b.id }}" {% if u.bike_id==b.id %} selected {% endif %}>{{ b.display_name }}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
|
||||
<svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
||||
<path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z" />
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="py-5 px-6 border-b border-gray-200 flex inline">
|
||||
<div class="flex justify-between w-full">
|
||||
<div></div>
|
||||
<div class="flex">
|
||||
|
||||
<div hx-delete="{{ url_for('delete_user', user_id=u.id) }}"
|
||||
hx-confirm="Are you sure you wish to delete your account {{ u.name }}?"
|
||||
hx-target="#users-container" class="cursor-pointer pr-2">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
|
||||
stroke="currentColor" class="w-6 h-6">
|
||||
<path stroke-linecap="round" stroke-linejoin="round"
|
||||
d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
|
||||
</svg>
|
||||
|
||||
</div>
|
||||
<div hx-get="{{ url_for('workouts', user_id=u.id) }}" hx-target="#container"
|
||||
class="cursor-pointer">
|
||||
<svg class="w-6 h-6 dark:text-white" xmlns="http://www.w3.org/2000/svg" fill="none"
|
||||
viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
|
||||
<path stroke-linecap="round" stroke-linejoin="round"
|
||||
d="M3.75 3.75v4.5m0-4.5h4.5m-4.5 0L9 9M3.75 20.25v-4.5m0 4.5h4.5m-4.5 0L9 15M20.25 3.75h-4.5m4.5 0v4.5m0-4.5L15 9m5.25 11.25h-4.5m4.5 0v-4.5m0 4.5L15 15">
|
||||
</path>
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<form class="w-full mt-4" hx-post="{{ url_for('users') }}" hx-target="#users-container">
|
||||
<form class="block p-6 bg-white border border-gray-200 rounded-lg shadow mt-4" hx-post="{{ url_for('users') }}"
|
||||
hx-target="#users-container">
|
||||
|
||||
<div class="flex flex-wrap mb-2">
|
||||
<div class="w-full md:w-1/2 px-3 mb-6 md:mb-0">
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,900&display=swap" rel="stylesheet" />
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tw-elements/dist/css/index.min.css" />
|
||||
<script src="https://cdn.tailwindcss.com/3.2.4"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/tw-elements/dist/js/index.min.js"></script>
|
||||
<script>
|
||||
tailwind.config = {
|
||||
darkMode: "class",
|
||||
@@ -55,6 +56,11 @@
|
||||
<div class="w-full px-4 mb-8">
|
||||
|
||||
<div class="bg-white shadow-md rounded-lg overflow-hidden" id="users-container">
|
||||
{% for u in users %}
|
||||
{% with user=u, workouts=u.workouts, bikes=bikes %}
|
||||
{% include 'workouts_list.html' %}
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
|
||||
{% with users=users, bikes=bikes %}
|
||||
{% include 'users.html' %}
|
||||
@@ -66,7 +72,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script src="https://cdn.jsdelivr.net/npm/tw-elements/dist/js/index.min.js"></script>
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
@@ -1,13 +1,55 @@
|
||||
{% for w in workouts %}
|
||||
<div class="rounded-t-lg border border-neutral-200 bg-white dark:border-neutral-600 dark:bg-neutral-800">
|
||||
<a href="#"
|
||||
class="block p-6 bg-white border border-gray-200 rounded-lg rounded-b-none shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700">
|
||||
<div class="flex flex-row justify-between">
|
||||
<h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">{{ u.name }}</h5>
|
||||
<div hx-delete="{{ url_for('delete_user', user_id=user.id) }}"
|
||||
hx-confirm="Are you sure you wish to delete your account {{ u.name }}?" hx-target="#users-container"
|
||||
class="cursor-pointer pr-2">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
|
||||
stroke="currentColor" class="w-6 h-6" data-darkreader-inline-stroke=""
|
||||
style="--darkreader-inline-stroke:currentColor;">
|
||||
<path stroke-linecap="round" stroke-linejoin="round"
|
||||
d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0">
|
||||
</path>
|
||||
</svg>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="w-full md:w-1/2 ">
|
||||
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2" for="grid-state">
|
||||
Bike
|
||||
</label>
|
||||
<div class="relative">
|
||||
<select
|
||||
class="block appearance-none w-full bg-gray-200 border border-gray-200 text-gray-700 py-3 px-4 pr-8 rounded leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
|
||||
id="grid-state" name="bike_id" required hx-get="{{ url_for('update_users_bike', user_id=user.id) }}"
|
||||
hx-target="#users-container">
|
||||
{% for b in bikes %}
|
||||
<option value="{{ b.id }}" {% if user.bike_id==b.id %} selected {% endif %}>{{ b.display_name }}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
|
||||
<svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
|
||||
<path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"></path>
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
class="shadow mt-4 bg-purple-500 hover:bg-purple-400 focus:shadow-outline focus:outline-none text-white font-bold py-2 px-4 rounded w-full md:w-auto"
|
||||
type="submit">New Workout</button>
|
||||
</a>
|
||||
|
||||
<div class="border border-neutral-200 border-b-lg bg-white dark:border-neutral-600 dark:bg-neutral-800">
|
||||
<h2 class="mb-0">
|
||||
<button
|
||||
class="accordion-button group relative flex w-full items-center rounded-t-[15px] border-0 bg-white py-4 px-5 text-left text-base text-neutral-800 transition [overflow-anchor:none] hover:z-[2] focus:z-[3] focus:outline-none dark:bg-neutral-800 dark:text-white [&:not([data-te-collapse-collapsed])]:bg-white [&:not([data-te-collapse-collapsed])]:text-primary [&:not([data-te-collapse-collapsed])]:[box-shadow:inset_0_-1px_0_rgba(229,231,235)] dark:[&:not([data-te-collapse-collapsed])]:bg-neutral-800 dark:[&:not([data-te-collapse-collapsed])]:text-primary-400 dark:[&:not([data-te-collapse-collapsed])]:[box-shadow:inset_0_-1px_0_rgba(75,85,99)]"
|
||||
type="button">
|
||||
<div>
|
||||
<h2 class="text-lg font-medium text-gray-900">{{ w.start_time }}</h2>
|
||||
<p class="text-sm text-gray-500">Duration: {{ w.duration }} | Average RPM: {{ w.average_rpm }} |
|
||||
Calories: {{ w.calories }} | Distance: {{ w.distance }}</p>
|
||||
<h2 class="text-lg font-medium text-gray-900">View 16 workouts</h2>
|
||||
<p class="text-sm text-gray-500">Duration: 35 days | Weekly average workouts: 25 mins|
|
||||
Calories: 84 | Distance: 17</p>
|
||||
</div>
|
||||
<span
|
||||
class="ml-auto h-5 w-5 shrink-0 rotate-[-180deg] fill-[#336dec] transition-transform duration-200 ease-in-out group-[[data-te-collapse-collapsed]]:rotate-0 group-[[data-te-collapse-collapsed]]:fill-[#212529] motion-reduce:transition-none dark:fill-blue-300 dark:group-[[data-te-collapse-collapsed]]:fill-white">
|
||||
@@ -18,29 +60,59 @@
|
||||
</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div class="!visible collapse {% if loop.index != 1 %}hidden{% endif %}">
|
||||
<div id="workout_view-{{ w.id }}">
|
||||
{% with workout=w, graph_types=['speed'] %}
|
||||
{% include 'workout_view.html' %}
|
||||
{% endwith %}
|
||||
</div>
|
||||
<button
|
||||
class="mx-4 mb-4 bg-gray-300 hover:bg-gray-400 text-gray-800 font-bold py-2 px-4 rounded inline-flex items-center"
|
||||
hx-delete="{{ url_for('delete_workout', user_id=w.user_id, workout_id=w.id) }}"
|
||||
hx-confirm="Are you sure you wish to delete this {{ w.duration }} workout at {{ w.start_time }}"
|
||||
hx-target="#container">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
|
||||
stroke="currentColor" class="w-6 h-6">
|
||||
<path stroke-linecap="round" stroke-linejoin="round"
|
||||
d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
|
||||
</svg>
|
||||
<div class="!visible collapse hidden">
|
||||
<div>
|
||||
{% for w in workouts %}
|
||||
<div class="border border-neutral-200 bg-white dark:border-neutral-600 dark:bg-neutral-800">
|
||||
<h2 class="mb-0">
|
||||
<button
|
||||
class="accordion-button group relative flex w-full items-center rounded-t-[15px] border-0 bg-white py-4 px-5 text-left text-base text-neutral-800 transition [overflow-anchor:none] hover:z-[2] focus:z-[3] focus:outline-none dark:bg-neutral-800 dark:text-white [&:not([data-te-collapse-collapsed])]:bg-white [&:not([data-te-collapse-collapsed])]:text-primary [&:not([data-te-collapse-collapsed])]:[box-shadow:inset_0_-1px_0_rgba(229,231,235)] dark:[&:not([data-te-collapse-collapsed])]:bg-neutral-800 dark:[&:not([data-te-collapse-collapsed])]:text-primary-400 dark:[&:not([data-te-collapse-collapsed])]:[box-shadow:inset_0_-1px_0_rgba(75,85,99)]"
|
||||
type="button">
|
||||
<div>
|
||||
<h2 class="text-lg font-medium text-gray-900">{{ w.start_time }}</h2>
|
||||
<p class="text-sm text-gray-500">Duration: {{ w.duration }} | Average RPM: {{ w.average_rpm
|
||||
}} |
|
||||
Calories: {{ w.calories }} | Distance: {{ w.distance }}</p>
|
||||
</div>
|
||||
<span
|
||||
class="ml-auto h-5 w-5 shrink-0 rotate-[-180deg] fill-[#336dec] transition-transform duration-200 ease-in-out group-[[data-te-collapse-collapsed]]:rotate-0 group-[[data-te-collapse-collapsed]]:fill-[#212529] motion-reduce:transition-none dark:fill-blue-300 dark:group-[[data-te-collapse-collapsed]]:fill-white">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
|
||||
stroke="currentColor" class="h-6 w-6">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 8.25l-7.5 7.5-7.5-7.5" />
|
||||
</svg>
|
||||
</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div class="!visible collapse {% if loop.index != 1 %}hidden{% endif %}">
|
||||
<div id="workout_view-{{ w.id }}">
|
||||
{% with workout=w, graph_types=['speed'] %}
|
||||
{% include 'workout_view.html' %}
|
||||
{% endwith %}
|
||||
</div>
|
||||
<button
|
||||
class="mx-4 mb-4 bg-gray-300 hover:bg-gray-400 text-gray-800 font-bold py-2 px-4 rounded inline-flex items-center"
|
||||
hx-delete="{{ url_for('delete_workout', user_id=w.user_id, workout_id=w.id) }}"
|
||||
hx-confirm="Are you sure you wish to delete this {{ w.duration }} workout at {{ w.start_time }}"
|
||||
hx-target="#container">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
|
||||
stroke="currentColor" class="w-6 h-6">
|
||||
<path stroke-linecap="round" stroke-linejoin="round"
|
||||
d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
|
||||
</svg>
|
||||
|
||||
<span>Delete</span>
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
<span>Delete</span>
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
|
||||
|
||||
<script>
|
||||
document.querySelectorAll('.accordion-button').forEach(header => {
|
||||
|
||||
Reference in New Issue
Block a user