From 6a72baf787b60816ff8cdb929c69df6714bcee4d Mon Sep 17 00:00:00 2001 From: Peter Stockings Date: Sun, 4 Dec 2022 19:53:14 +1100 Subject: [PATCH] Fix bug where new date wasnt converted to date object --- app.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app.py b/app.py index fe2d986..c16df7e 100644 --- a/app.py +++ b/app.py @@ -113,11 +113,9 @@ def get_workout_modal(person_id, workout_id): @ validate_person def create_workout(person_id): new_workout_id = db.create_workout(person_id) - if htmx: - workout = db.get_workout(person_id, new_workout_id) - return render_template('partials/page/workout.html', - workout=workout), 200, {"HX-Trigger": "updatedPeople", "HX-Push": url_for('get_workout', person_id=person_id, workout_id=new_workout_id)} - return redirect(url_for('get_workout', person_id=person_id, workout_id=new_workout_id)) + workout = db.get_workout(person_id, new_workout_id) + return render_template('partials/workout_modal.html', + workout=workout), 200, {"HX-Trigger": "updatedPeople"} @ app.route("/person//workout/") @@ -134,9 +132,7 @@ def get_workout(person_id, workout_id): @ validate_workout def delete_workout(person_id, workout_id): db.delete_workout(workout_id) - person = db.get_person(person_id) - return render_template('partials/page/person.html', - person=person), 200, {"HX-Trigger": "updatedPeople", "HX-Push": url_for('get_person', person_id=person_id)} + return "", 200, {"HX-Trigger": "updatedPeople"} @ app.route("/person//workout//start_date_edit_form", methods=['GET']) @@ -151,7 +147,7 @@ def get_workout_start_date_edit_form(person_id, workout_id): def update_workout_start_date(person_id, workout_id): new_start_date = request.form.get('start-date') db.update_workout_start_date(workout_id, new_start_date) - return render_template('partials/start_date.html', person_id=person_id, workout_id=workout_id, start_date=new_start_date) + return render_template('partials/start_date.html', person_id=person_id, workout_id=workout_id, start_date=convert_str_to_date(new_start_date, '%Y-%m-%d')) @ app.route("/person//workout//start_date", methods=['GET'])