Add min/max date filter (really needs refactor)

app.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 import os
 from flask import Flask, render_template, redirect, request, url_for
 import jinja_partials
@@ -33,25 +34,39 @@ def get_person_list():
 @ app.route("/person/<int:person_id>")
 @ validate_person
 def get_person(person_id):
-    selected_exercise_ids = [int(i)
-                             for i in request.args.getlist('exercise_id')]
     person = db.get_person(person_id)
 
+    max_date = request.args.get(
+        'max_date') or datetime.strptime(max(person['Workouts'], key=lambda x: datetime.strptime(x['StartDate'], '%b %d %Y'))['StartDate'], '%b %d %Y').strftime('%Y-%m-%d')
+    min_date = request.args.get(
+        'min_date') or datetime.strptime(min(person['Workouts'], key=lambda x: datetime.strptime(x['StartDate'], '%b %d %Y'))['StartDate'], '%b %d %Y').strftime('%Y-%m-%d')
+
+    selected_exercise_ids = [int(i)
+                             for i in request.args.getlist('exercise_id')] or [e['ExerciseId'] for e in person['Exercises']]
+
+    def filter_workout_topsets(workout, selected_exercise_ids):
+        workout['TopSets'] = [topset for topset in workout['TopSets']
+                              if topset['ExerciseId'] in selected_exercise_ids]
+        return workout
+
+    person['Workouts'] = [filter_workout_topsets(workout, selected_exercise_ids) for workout in person['Workouts'] if datetime.strptime(
+        workout['StartDate'], '%b %d %Y').strftime('%Y-%m-%d') <= max_date and datetime.strptime(workout['StartDate'], '%b %d %Y').strftime('%Y-%m-%d') >= min_date]
+
     if selected_exercise_ids:
         filtered_exercises = filter(
             lambda e: e['ExerciseId'] in selected_exercise_ids, person['Exercises'])
         person['FilteredExercises'] = list(filtered_exercises)
         if htmx:
             return render_template('partials/page/person.html',
-                                   person=person, is_filtered=True, selected_exercise_ids=selected_exercise_ids), 200, {"HX-Trigger": "updatedPeople"}
+                                   person=person, is_filtered=True, selected_exercise_ids=selected_exercise_ids, max_date=max_date, min_date=min_date), 200, {"HX-Trigger": "updatedPeople"}
 
-        return render_template('person.html', person=person, is_filtered=True, selected_exercise_ids=selected_exercise_ids)
+        return render_template('person.html', person=person, is_filtered=True, selected_exercise_ids=selected_exercise_ids, max_date=max_date, min_date=min_date)
 
     if htmx:
         return render_template('partials/page/person.html',
-                               person=person, is_filtered=False), 200, {"HX-Trigger": "updatedPeople"}
+                               person=person, is_filtered=False, max_date=max_date, min_date=min_date), 200, {"HX-Trigger": "updatedPeople"}
 
-    return render_template('person.html', person=person)
+    return render_template('person.html', person=person, max_date=max_date, min_date=min_date)
 
 
 @ app.route("/person/<int:person_id>/workout", methods=['POST'])

templates/partials/page/person.html

@@ -14,12 +14,14 @@
             </div>
         </div>
 
+
         <div class="flex">
             {% set exercise_list = person['FilteredExercises'] if is_filtered else person['Exercises'] %}
 
             {% for e in person['Exercises'] %}
             <div class="flex items-center mr-4" hx-get="{{ url_for('get_person', person_id=person['PersonId']) }}"
-                hx-include="[name='exercise_id']" hx-target="#container" hx-push-url="true">
+                hx-include="[name='exercise_id'],[name='min_date'],[name='max_date']" hx-target="#container"
+                hx-push-url="true">
                 <input {{ is_checked(e['ExerciseId'], selected_exercise_ids) }} type="checkbox" name="exercise_id"
                     value="{{ e['ExerciseId'] }}"
                     class="w-4 h-4 text-blue-600 bg-gray-100 rounded border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
@@ -30,6 +32,51 @@
             {% endfor %}
         </div>
 
+        <div class="flex flex-wrap -mx-3 mb-2 mt-4">
+            <div class="w-full md:w-1/2 px-3 mb-6 md:mb-0">
+                <label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2" for="grid-city">
+                    Min date
+                </label>
+                <div class="relative">
+                    <div class="flex absolute inset-y-0 left-0 items-center pl-3 pointer-events-none">
+                        <svg aria-hidden="true" class="w-5 h-5 text-gray-500 dark:text-gray-400" fill="currentColor"
+                            viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                            <path fill-rule="evenodd"
+                                d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
+                                clip-rule="evenodd"></path>
+                        </svg>
+                    </div>
+                    <input type="date"
+                        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full pl-10 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 w-full"
+                        name="min_date" value="{{ min_date }}"
+                        hx-get="{{ url_for('get_person', person_id=person['PersonId']) }}"
+                        hx-include="[name='exercise_id'],[name='min_date'],[name='max_date']" hx-target="#container"
+                        hx-push-url="true" hx-trigger="change">
+                </div>
+            </div>
+            <div class="w-full md:w-1/2 px-3 mb-6 md:mb-0">
+                <label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2" for="grid-zip">
+                    Max date
+                </label>
+                <div class="relative">
+                    <div class="flex absolute inset-y-0 left-0 items-center pl-3 pointer-events-none">
+                        <svg aria-hidden="true" class="w-5 h-5 text-gray-500 dark:text-gray-400" fill="currentColor"
+                            viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                            <path fill-rule="evenodd"
+                                d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
+                                clip-rule="evenodd"></path>
+                        </svg>
+                    </div>
+                    <input type="date"
+                        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full pl-10 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 w-full"
+                        name="max_date" value="{{ max_date }}"
+                        hx-get="{{ url_for('get_person', person_id=person['PersonId']) }}"
+                        hx-include="[name='exercise_id'],[name='min_date'],[name='max_date']" hx-target="#container"
+                        hx-push-url="true" hx-trigger="change">
+                </div>
+            </div>
+        </div>
+
         <div class="flex flex-col mt-8">
             <div class="overflow-x-auto rounded-lg">
                 <div class="align-middle inline-block min-w-full">

templates/person.html

@@ -3,6 +3,7 @@
 {% block content %}
 
 {{ render_partial('partials/page/person.html',
-person=person, is_filtered=is_filtered or False, selected_exercise_ids=selected_exercise_ids) }}
+person=person, is_filtered=is_filtered or False, selected_exercise_ids=selected_exercise_ids, max_date=max_date,
+min_date=min_date) }}
 
 {% endblock %}