Minor changes
This commit is contained in:
Peter Stockings
94
app.py
94
app.py
@@ -150,17 +150,7 @@ def workout(user_id, workout_id):
|
|||||||
|
|
||||||
# ax.set_title(
|
# ax.set_title(
|
||||||
# 'Cadence Readings for Workout {}'.format(workout_id))
|
# 'Cadence Readings for Workout {}'.format(workout_id))
|
||||||
# Hide X and Y axes label marks
|
|
||||||
# ax.xaxis.set_tick_params(labelbottom=False)
|
|
||||||
# ax.yaxis.set_tick_params(labelleft=False)
|
|
||||||
# Hide X and Y axes tick marks
|
|
||||||
# ax.set_xticks([])
|
|
||||||
# ax.set_yticks([])
|
|
||||||
# use formatters to specify major and minor ticks
|
|
||||||
# format date as hh:mm
|
|
||||||
ax.xaxis.set_major_formatter(mdates.DateFormatter("%H:%M"))
|
ax.xaxis.set_major_formatter(mdates.DateFormatter("%H:%M"))
|
||||||
# ax.xaxis.set_major_formatter(mdates.DateFormatter("%Y-%m"))
|
|
||||||
# ax.xaxis.set_minor_formatter(mdates.DateFormatter("%Y-%m"))
|
|
||||||
|
|
||||||
# set the y-axis limits to start at 0
|
# set the y-axis limits to start at 0
|
||||||
ax.set_ylim(bottom=0)
|
ax.set_ylim(bottom=0)
|
||||||
@@ -179,10 +169,11 @@ def workout(user_id, workout_id):
|
|||||||
return jsonify({'message': 'No cadence readings for workout {}.'.format(workout_id)}), 404
|
return jsonify({'message': 'No cadence readings for workout {}.'.format(workout_id)}), 404
|
||||||
elif request.method == 'DELETE':
|
elif request.method == 'DELETE':
|
||||||
# Delete the workout and its associated cadence readings
|
# Delete the workout and its associated cadence readings
|
||||||
db.session.delete(workout)
|
|
||||||
CadenceReading.query.filter_by(workout_id=workout_id).delete()
|
CadenceReading.query.filter_by(workout_id=workout_id).delete()
|
||||||
|
db.session.delete(workout)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
return jsonify({'message': 'Workout {} deleted successfully.'.format(workout_id)}), 200
|
workouts_data = get_workouts_for_user(user_id)
|
||||||
|
return render_template('workouts_list.html', workouts=workouts_data)
|
||||||
else:
|
else:
|
||||||
return jsonify({'message': 'Workout {} not found for user {}.'.format(workout_id, user_id)}), 404
|
return jsonify({'message': 'Workout {} not found for user {}.'.format(workout_id, user_id)}), 404
|
||||||
|
|
||||||
@@ -195,7 +186,8 @@ def workouts_for_user(user_id):
|
|||||||
|
|
||||||
def get_workouts_for_user(user_id):
|
def get_workouts_for_user(user_id):
|
||||||
workouts_data = []
|
workouts_data = []
|
||||||
workouts = Workout.query.filter_by(user_id=user_id).all()
|
workouts = Workout.query.filter_by(user_id=user_id).order_by(
|
||||||
|
Workout.created_at.desc()).all()
|
||||||
for workout in workouts:
|
for workout in workouts:
|
||||||
cadence_readings = CadenceReading.query.filter_by(
|
cadence_readings = CadenceReading.query.filter_by(
|
||||||
workout_id=workout.id).all()
|
workout_id=workout.id).all()
|
||||||
@@ -205,86 +197,26 @@ def get_workouts_for_user(user_id):
|
|||||||
end_time = max(
|
end_time = max(
|
||||||
reading.created_at for reading in cadence_readings)
|
reading.created_at for reading in cadence_readings)
|
||||||
duration = end_time - start_time
|
duration = end_time - start_time
|
||||||
if duration >= timedelta(hours=1):
|
|
||||||
duration_str = str(duration)
|
|
||||||
else:
|
|
||||||
duration_str = str(duration).split('.')[0]
|
|
||||||
average_rpm = sum(
|
average_rpm = sum(
|
||||||
reading.rpm for reading in cadence_readings) / len(cadence_readings)
|
reading.rpm for reading in cadence_readings) / len(cadence_readings)
|
||||||
workouts_data.append({
|
workouts_data.append({
|
||||||
'id': workout.id,
|
'id': workout.id,
|
||||||
'user_id': user_id,
|
'user_id': user_id,
|
||||||
'start_time': start_time.strftime('%Y-%m-%d %H:%M:%S'),
|
'start_time': start_time.strftime('%Y-%m-%d %H:%M:%S'),
|
||||||
'duration': duration_str,
|
'duration': format_duration(duration),
|
||||||
'average_rpm': int(average_rpm)
|
'average_rpm': int(average_rpm)
|
||||||
})
|
})
|
||||||
return workouts_data
|
return workouts_data
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
def format_duration(duration):
|
||||||
app.run(debug=True)
|
hours, remainder = divmod(duration.seconds, 3600)
|
||||||
|
minutes, _ = divmod(remainder, 60)
|
||||||
|
|
||||||
|
if duration >= timedelta(hours=1):
|
||||||
# @app.after_request
|
return f"{hours}h {minutes}m"
|
||||||
# def response_minify(response):
|
else:
|
||||||
# """
|
return f"{minutes}m"
|
||||||
# minify html response to decrease site traffic
|
|
||||||
# """
|
|
||||||
# if response.content_type == u'text/html; charset=utf-8':
|
|
||||||
# response.set_data(
|
|
||||||
# minify_html.minify(response.get_data(
|
|
||||||
# as_text=True), minify_js=True, remove_processing_instructions=True)
|
|
||||||
# )
|
|
||||||
|
|
||||||
# return response
|
|
||||||
# return response
|
|
||||||
|
|
||||||
|
|
||||||
# @ app.route("/")
|
|
||||||
# def home():
|
|
||||||
# return render_template('attemptv2.html')
|
|
||||||
|
|
||||||
|
|
||||||
# @ app.route("/devices")
|
|
||||||
# def devices():
|
|
||||||
# devices = db.get_devices()
|
|
||||||
# return render_template('devices.html', devices=devices)
|
|
||||||
|
|
||||||
|
|
||||||
# @ app.route("/device/<device_id>")
|
|
||||||
# def device(device_id):
|
|
||||||
# device = db.get_device(device_id)
|
|
||||||
# return render_template('device.html', device=device)
|
|
||||||
|
|
||||||
|
|
||||||
# @app.route("/overview/<device_id>")
|
|
||||||
# def overview(device_id):
|
|
||||||
# cadences = db.get_all_cadences(device_id)
|
|
||||||
# last_cadence = cadences[-1]['rpm'] if cadences else 0
|
|
||||||
# if cadences:
|
|
||||||
# first = cadences[0]['logged_at']
|
|
||||||
# last = cadences[-1]['logged_at']
|
|
||||||
# duration = str(timedelta(seconds=(last-first).seconds))
|
|
||||||
|
|
||||||
# last_cadence = cadences[-1]['rpm']
|
|
||||||
|
|
||||||
# power = round(decimal.Decimal(0.0011)*last_cadence ** 3 + decimal.Decimal(
|
|
||||||
# 0.0026) * last_cadence ** 2 + decimal.Decimal(0.5642)*last_cadence)
|
|
||||||
|
|
||||||
# graph_data = generate_sparkline_graph(
|
|
||||||
# [c['rpm'] for c in cadences[-100:]])
|
|
||||||
|
|
||||||
# return render_template('overview.html', last_cadence=last_cadence, power=power, duration=duration, cadences=cadences[-15:], graph_data=graph_data)
|
|
||||||
# return render_template('overview.html', last_cadence=0, power=0, duration=duration, cadences=[], graph_data='')
|
|
||||||
|
|
||||||
|
|
||||||
# @ app.route("/cadence", methods=['POST'])
|
|
||||||
# def cadence():
|
|
||||||
# data = request.get_json()
|
|
||||||
# print('' + datetime.now().replace(microsecond=0).isoformat() +
|
|
||||||
# ' ' + json.dumps(data))
|
|
||||||
# db.insert_cadence(data['rpm'], data['id'])
|
|
||||||
# return 'ok'
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|||||||
@@ -107,7 +107,7 @@
|
|||||||
toggleButton.textContent = 'Start';
|
toggleButton.textContent = 'Start';
|
||||||
disconnect();
|
disconnect();
|
||||||
|
|
||||||
fetch("/user/1/workouts", {
|
fetch("{{ url_for('workouts', user_id=user.id) }}", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
Accept: "application/json",
|
Accept: "application/json",
|
||||||
81
templates/users_and_workouts.html
Normal file
81
templates/users_and_workouts.html
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Cardio Tracker</title>
|
||||||
|
<link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet" />
|
||||||
|
<script src="https://unpkg.com/htmx.org"></script>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body class="bg-gray-100 font-sans leading-normal tracking-normal">
|
||||||
|
<nav class="bg-white shadow-lg">
|
||||||
|
<div class="container mx-auto px-4">
|
||||||
|
<div class="flex justify-between">
|
||||||
|
<div class="flex items-center">
|
||||||
|
<a class="text-gray-800 text-xl font-bold" href="/">Cardio Tracker</a>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center">
|
||||||
|
<form class="flex py-1" action="/" method="POST">
|
||||||
|
<input
|
||||||
|
class="rounded-l-lg p-2 border-t mr-0 border-b border-l text-gray-800 border-gray-200 bg-white"
|
||||||
|
name="name" placeholder="New user name" required />
|
||||||
|
<button
|
||||||
|
class="px-4 rounded-r-lg bg-green-500 text-white font-bold p-2 uppercase border-green-600 border-t border-b border-r"
|
||||||
|
type="submit">
|
||||||
|
Add User
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
<div class="container mx-auto mt-8">
|
||||||
|
<div class="flex flex-col sm:flex-row justify-between">
|
||||||
|
<div class="w-full sm:w-1/2 px-4 mb-8">
|
||||||
|
<h1 class="text-gray-800 font-bold text-2xl mb-4">Users</h1>
|
||||||
|
<div class="bg-white shadow-md rounded-lg overflow-hidden">
|
||||||
|
<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">Workouts</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) }}">{{ u.name }}</a></td>
|
||||||
|
<td class="py-4 px-6 border-b border-gray-200 flex inline">
|
||||||
|
<div class="flex justify-between w-full">
|
||||||
|
<div>{{ u.workouts_count }}</div>
|
||||||
|
<div hx-get="{{ url_for('workouts', user_id=u.id) }}" hx-target="#container">
|
||||||
|
<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>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="w-full sm:w-1/2 px-4 mb-8" id="container">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
46
templates/workouts_list.html
Normal file
46
templates/workouts_list.html
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
{% for w in workouts %}
|
||||||
|
<div class="rounded-t-lg border border-neutral-200 bg-white dark:border-neutral-600 dark:bg-neutral-800">
|
||||||
|
<h2 class="mb-0" id="headingOne">
|
||||||
|
<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" data-te-collapse-init data-te-target="#collapseOne" aria-expanded="true"
|
||||||
|
aria-controls="collapseOne">
|
||||||
|
<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 }}</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.counter != 1 %}hidden{% endif %}">
|
||||||
|
<img src="{{ url_for('workout', user_id=w.user_id, workout_id=w.id) }}" alt="No image">
|
||||||
|
<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('workout', user_id=w.user_id, workout_id=w.id) }}" 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>
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
<span>Delete</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
<script>
|
||||||
|
document.querySelectorAll('.accordion-button').forEach(header => {
|
||||||
|
header.addEventListener('click', () => {
|
||||||
|
header.parentElement.parentElement.querySelector('div.collapse').classList.toggle('hidden');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
Reference in New Issue
Block a user