Show relevant pages

atst/filters.py

@@ -76,6 +76,19 @@ def dateFromString(value, formatter="%m/%Y"):
     return datetime.datetime.strptime(value, formatter)
 
 
+def pageWindow(pagination, size=2):
+    page = pagination.page
+    num_pages = pagination.pages
+
+    over = max(0, page + size - num_pages)
+    under = min(0, page - size - 1)
+
+    return (
+        max(1, (page - size) - over),
+        min(num_pages, (page + size) - under)
+    )
+
+
 def register_filters(app):
     app.jinja_env.filters["iconSvg"] = iconSvg
     app.jinja_env.filters["dollars"] = dollars
@@ -87,3 +100,4 @@ def register_filters(app):
     app.jinja_env.filters["renderList"] = renderList
     app.jinja_env.filters["formattedDate"] = formattedDate
     app.jinja_env.filters["dateFromString"] = dateFromString
+    app.jinja_env.filters["pageWindow"] = pageWindow

atst/routes/__init__.py

@@ -124,7 +124,7 @@ def logout():
 def get_pagination_opts(request, default_page=1, default_per_page=50):
     return {
         "page": int(request.args.get("page", default_page)),
-        "per_page": int(request.args.get("per_page", default_per_page)),
+        "per_page": int(request.args.get("perPage", default_per_page)),
     }
 
 

templates/audit_log.html

@@ -40,18 +40,50 @@
 
   </section>
 
-  {% set page_route = 'atst.activity_history' %}
+  {% macro Page(pagination, route, i, label=None) -%}
-  {% set pagination = audit_events %}
+    {% set label = label or i %}
 
-  <div class="pagination">
+    {% if i == pagination.page %}
-    {% for i in range(1, pagination.pages + 1) %}
+      <button class="usa-button usa-button-primary">{{ label }}</button>
-      <span class="page">
+    {% else %}
-        {% if i == pagination.page %}
+      <a class="usa-button usa-button-secondary page" href="{{ url_for(route, page=i, perPage=pagination.per_page) }}">{{ label }}</a>
-          {{ i }}
+    {% endif%}
-        {% else %}
+  {%- endmacro %}
-          <a href="{{ url_for(page_route, page=i) }}">{{ i }}</a>
+
-        {% endif %}
+  {% macro Pagination(pagination, route) -%}
-      </span>
+    {% set first %}
-    {% endfor %}
+      {{ Page(pagination, route, 1, label="first") }}
-  </div>
+      {{ Page(pagination, route, pagination.page - 1, label="prev") }}
+    {% endset %}
+
+    {% set last %}
+      {{ Page(pagination, route, pagination.page + 1, label="next") }}
+      {{ Page(pagination, route, pagination.pages, label="last") }}
+    {% endset %}
+
+    <div class="pagination">
+
+      {% if pagination.page == 1 %}
+        {% set max_page = [pagination.pages, 5] | min %}
+
+        {% for i in range(1, max_page + 1) %}
+          {{ Page(pagination, route, i) }}
+        {% endfor %}
+        {{ last }}
+      {% elif pagination.page == pagination.pages %}
+        {{ first }}
+        {% for i in range(pagination.pages - 4, pagination.pages + 1) %}
+          {{ Page(pagination, route, i) }}
+        {% endfor %}
+      {% else %}
+        {% set window = pagination | pageWindow %}
+        {{ first }}
+        {% for i in range(window.0, window.1 + 1) %}
+          {{ Page(pagination, route, i) }}
+        {% endfor %}
+        {{ last }}
+      {% endif %}
+    </div>
+  {%- endmacro %}
+  {{ Pagination(audit_events, 'atst.activity_history') }}
 {% endblock %}