geo-activity-playground 0.45.0__py3-none-any.whl → 1.1.0__py3-none-any.whl

geo_activity_playground/webui/blueprints/entry_views.py

@@ -1,5 +1,6 @@
 import collections
 import datetime
+from typing import Any
 
 import altair as alt
 import flask
@@ -7,6 +8,7 @@ import pandas as pd
 import sqlalchemy
 from flask import render_template
 from flask import Response
+from flask.typing import ResponseReturnValue
 
 from ...core.activities import ActivityRepository
 from ...core.activities import make_geojson_from_time_series
@@ -16,6 +18,7 @@ from ...core.datamodel import DB
 from ..columns import column_distance
 from ..columns import column_elevation_gain
 from ..columns import ColumnDescription
+from ..columns import META_COLUMNS
 from ..plot_util import make_kind_scale
 
 
@@ -23,19 +26,16 @@ def register_entry_views(
     app: flask.Flask, repository: ActivityRepository, config: Config
 ) -> None:
     @app.route("/")
-    def index() -> Response:
-        context = {"latest_activities": []}
+    def index() -> ResponseReturnValue:
+        context: dict[str, Any] = {"latest_activities": []}
+        df = repository.meta
 
         if len(repository):
-            kind_scale = make_kind_scale(repository.meta, config)
-            context["distance_last_30_days_plot"] = _last_30_days_meta_plot(
-                repository.meta, kind_scale, column_distance
-            )
-
-            if config.reliable_elevation_measurements:
-                context["elevation_gain_last_30_days_plot"] = _last_30_days_meta_plot(
-                    repository.meta, kind_scale, column_elevation_gain
-                )
+            kind_scale = make_kind_scale(df, config)
+            context["last_30_days_plot"] = {
+                column.display_name: _last_30_days_meta_plot(df, kind_scale, column)
+                for column in META_COLUMNS
+            }
 
             context["latest_activities"] = collections.defaultdict(list)
             for activity in DB.session.scalars(

geo_activity_playground/webui/blueprints/equipment_blueprint.py

@@ -2,6 +2,7 @@ import altair as alt
 import pandas as pd
 from flask import Blueprint
 from flask import render_template
+from flask.typing import ResponseReturnValue
 
 from ...core.activities import ActivityRepository
 from ...core.config import Config
@@ -15,7 +16,7 @@ def make_equipment_blueprint(
     blueprint = Blueprint("equipment", __name__, template_folder="templates")
 
     @blueprint.route("/")
-    def index():
+    def index() -> ResponseReturnValue:
         equipment_summary = get_equipment_use_table(
             repository.meta, config.equipment_offsets
         )