geo-activity-playground 0.38.2__py3-none-any.whl → 0.39.1__py3-none-any.whl

geo_activity_playground/webui/search_util.py

@@ -1,11 +1,9 @@
-from typing import Optional
-
 from werkzeug.datastructures import MultiDict
 
-from geo_activity_playground.core.config import ConfigAccessor
-from geo_activity_playground.core.meta_search import _parse_date_or_none
-from geo_activity_playground.core.meta_search import SearchQuery
-from geo_activity_playground.webui.authenticator import Authenticator
+from ..core.config import ConfigAccessor
+from ..core.meta_search import _parse_date_or_none
+from ..core.meta_search import SearchQuery
+from .authenticator import Authenticator
 
 
 def search_query_from_form(args: MultiDict) -> SearchQuery:

geo_activity_playground/webui/templates/activity/day.html.j2

@@ -0,0 +1,81 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<div class="row mb-3">
+    <div class="col">
+        <h1>{{ date }}</h1>
+    </div>
+</div>
+
+
+<div class="row mb-3">
+    <div class="col-12">
+        <div id="activity-map" style="height: 500px;"></div>
+        <script>
+            var map = L.map('activity-map', {
+                fullscreenControl: true
+            });
+            L.tileLayer('/tile/grayscale/{z}/{x}/{y}.png', {
+                maxZoom: 19,
+                attribution: '{{ map_tile_attribution|safe }}'
+            }).addTo(map);
+
+            let geojson = L.geoJSON({{ geojson| safe }}, {
+                style: function (feature) { return { color: feature.properties.color } }
+            }).addTo(map)
+            map.fitBounds(geojson.getBounds());
+        </script>
+    </div>
+</div>
+
+<div class="row mb-3">
+    <div class="col">
+        <h2>Activities</h2>
+        <div class="table-responsive">
+            <table class="table table-sort table-arrows">
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Date</th>
+                        <th>Distance / km</th>
+                        <th>Elapsed time</th>
+                        <th>Speed / km/h</th>
+                        <th>Equipment</th>
+                        <th>Kind</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for activity in activities %}
+                    <tr>
+                        <td><span style="color: {{ activity['color'] }};">█</span> <a
+                                href="{{ url_for('activity.show', id=activity.id) }}">{{
+                                activity.name }}</a></td>
+                        <td>{{ activity.start|dt }}</td>
+                        <td>{{ activity.distance_km | round(1) }}</td>
+                        <td>{{ activity.elapsed_time|td }}</td>
+                        <td>{{ activity.average_speed_moving_kmh|round(1) }}</td>
+                        <td>{{ activity["equipment"] }}</td>
+                        <td>{{ activity["kind"] }}</td>
+                    </tr>
+                    {% endfor %}
+                    {% if activities|length > 1 %}
+                    <tr>
+                        <td><b>Total</b></td>
+                        <td></td>
+                        <td><b>{{ total_distance | round(1) }}</b></td>
+                        <td><b>{{ total_elapsed_time|td }}</b></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    {% endif %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+
+<h2>Share picture</h2>
+
+<p><img class="img-fluid" src="{{ url_for('.day_sharepic', year=year, month=month, day=day) }}" /></p>
+
+{% endblock %}

geo_activity_playground/webui/templates/activity/edit.html.j2

@@ -0,0 +1,38 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Edit Activity</h1>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="name" class="form-label">Name</label>
+        <input type="text" class="form-control" id="name" name="name" value="{{ activity.name }}" />
+    </div>
+
+    <div class="mb-3">
+        <label for="kind" class="form-label">Kind</label>
+        <select class="form-control" id="kind" name="kind">
+            <option value="null" {% if activity.kind==None %} selected {% endif %}>None</option>
+            {% for kind in kinds %}
+            <option value="{{ kind.id }}" {% if activity.kind==kind %} selected {% endif %}>{{ kind.name }}</option>
+            {% endfor %}
+        </select>
+    </div>
+
+    <div class="mb-3">
+        <label for="equipment" class="form-label">Equipment</label>
+        <select class="form-control" id="equipment" name="equipment">
+            <option value="null" {% if activity.equipment==None %} selected {% endif %}>None</option>
+            {% for equipment in equipments %}
+            <option value="{{ equipment.id }}" {% if activity.equipment==equipment %} selected {% endif %}>
+                {{ equipment.name }}
+            </option>
+            {% endfor %}
+        </select>
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+{% endblock %}

geo_activity_playground/webui/{activity/templates → templates}/activity/name.html.j2

@@ -50,33 +50,35 @@
     <div class="col">
         <h2>Activities</h2>
 
-        <table class="table table-sort table-arrows">
-            <thead>
-                <tr>
-                    <th>Name</th>
-                    <th>Date</th>
-                    <th class="numeric-sort">Distance / km</th>
-                    <th>Elapsed time</th>
-                    <th>Speed / km/h</th>
-                    <th>Equipment</th>
-                    <th>Kind</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for activity in activities %}
-                <tr>
-                    <td><span style="color: {{ activity['color'] }};">█</span> <a
-                            href="{{ url_for('activity.show', id=activity.id) }}">{{
-                            activity.name }}</a></td>
-                    <td>{{ activity.start|dt }}</td>
-                    <td>{{ activity.distance_km | round(1) }}</td>
-                    <td>{{ activity.elapsed_time|td }}</td>
-                    <td>{{ activity.average_speed_moving_kmh|round(1) }}</td>
-                    <td>{{ activity["equipment"] }}</td>
-                    <td>{{ activity["kind"] }}</td>
-                </tr>
-                {% endfor %}
-            </tbody>
+        <div class="table-responsive">
+            <table class="table table-sort table-arrows">
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Date</th>
+                        <th class="numeric-sort">Distance / km</th>
+                        <th>Elapsed time</th>
+                        <th>Speed / km/h</th>
+                        <th>Equipment</th>
+                        <th>Kind</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for activity in activities %}
+                    <tr>
+                        <td><span style="color: {{ activity['color'] }};">█</span> <a
+                                href="{{ url_for('activity.show', id=activity.id) }}">{{
+                                activity.name }}</a></td>
+                        <td>{{ activity.start|dt }}</td>
+                        <td>{{ activity.distance_km | round(1) }}</td>
+                        <td>{{ activity.elapsed_time|td }}</td>
+                        <td>{{ activity.average_speed_moving_kmh|round(1) }}</td>
+                        <td>{{ activity["equipment"] }}</td>
+                        <td>{{ activity["kind"] }}</td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
         </table>
     </div>
 </div>

geo_activity_playground/webui/{activity/templates → templates}/activity/show.html.j2

@@ -12,16 +12,19 @@
         <dl>
             <dt>Name</dt>
             <dd>{{ activity["name"] }}</dd>
+
+            {% if activity.kind %}
             <dt>Kind</dt>
-            <dd>{{ activity.kind }}</dd>
-            <dt>Commute</dt>
-            <dd>{{ activity.commute }}</dd>
+            <dd>{{ activity.kind.name }}</dd>
+            {% endif %}
+
             <dt>Distance</dt>
             <dd>{{ activity.distance_km|round(1) }} km</dd>
-            <dt>Elapsed time</dt>
-            <dd>{{ activity.elapsed_time|td }}</dd>
-            <dt>Moving time</dt>
-            <dd>{{ activity.moving_time|td }}</dd>
+
+            {% if activity.elapsed_time %}
+            <dt>Duration</dt>
+            <dd>{{ activity.elapsed_time|td }} elapsed, {{ activity.moving_time|td }} moving</dd>
+
             <dt>Average moving speed</dt>
             <dd>{{ activity.average_speed_moving_kmh|round(1) }} km/h = {{
                 (60/activity.average_speed_moving_kmh)|round(1) }} min/km</dd>
@@ -32,27 +35,46 @@
             <dd><a href="{{ url_for('activity.day', year=date.year, month=date.month, day=date.day) }}">{{ date }}</a>
                 {{ time }}
             </dd>
+            {% endif %}
+
+            {% if activity.calories %}
             <dt>Calories</dt>
             <dd>{{ activity.calories }}</dd>
+            {% endif %}
+
+            {% if activity.steps %}
             <dt>Steps</dt>
             <dd>{{ activity.steps }}</dd>
-            {% if activity.elevation_gain is defined %}
+            {% endif %}
+
+            {% if activity.elevation_gain %}
             <dt>Elevation gain</dt>
             <dd>{{ activity.elevation_gain|round(0) }} m</dd>
             {% endif %}
+
+            {% if activity.equipment %}
             <dt>Equipment</dt>
-            <dd>{{ activity['equipment'] }}</dd>
+            <dd>{{ activity.equipment.name }}</dd>
+            {% endif %}
+
+            {% if new_tiles[14] %}
             <dt>New Explorer Tiles</dt>
             <dd>{{ new_tiles[14] }}</dd>
+            {% endif %}
+
+            {% if new_tiles[17] %}
             <dt>New Squadratinhos</dt>
             <dd>{{ new_tiles[17] }}</dd>
+            {% endif %}
+
             <dt>ID</dt>
             <dd>{{ activity.id }}</dd>
             <dt>Source path</dt>
             <dd>{{ activity.path }}</dd>
         </dl>
 
-        <a href="{{ url_for('.edit', id=activity['id']) }}" class="btn btn-secondary btn-small">Edit metadata</a>
+        <a href="{{ url_for('.edit', id=activity['id']) }}" class="btn btn-secondary btn-small">Edit</a>
+        <a href="{{ url_for('.trim', id=activity['id']) }}" class="btn btn-secondary btn-small">Trim</a>
     </div>
     <div class="col-sm-12 col-md-8">
         <div id="activity-map" style="height: 500px;" class="mb-3"></div>
@@ -207,29 +229,31 @@
 
         <p><a href="{{ url_for('.name', name=activity['name']) }}">Overview over these activities</a></p>
 
-        <table class="table table-sort table-arrows">
-            <thead>
-                <tr>
-                    <th>Date</th>
-                    <th class="numeric-sort">Distance / km</th>
-                    <th>Elapsed time</th>
-                    <th>Equipment</th>
-                    <th>Kind</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for other_activity in similar_activites %}
-                <tr>
-                    <td><a href="{{ url_for('.show', id=other_activity.id) }}">{{ other_activity.start|dt
-                            }}</a></td>
-                    <td>{{ other_activity.distance_km | round(1) }}</td>
-                    <td>{{ other_activity.elapsed_time|td }}</td>
-                    <td>{{ other_activity["equipment"] }}</td>
-                    <td>{{ other_activity["kind"] }}</td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
+        <div class="table-responsive">
+            <table class="table table-sort table-arrows">
+                <thead>
+                    <tr>
+                        <th>Date</th>
+                        <th class="numeric-sort">Distance / km</th>
+                        <th>Elapsed time</th>
+                        <th>Equipment</th>
+                        <th>Kind</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for other_activity in similar_activites %}
+                    <tr>
+                        <td><a href="{{ url_for('.show', id=other_activity.id) }}">{{ other_activity.start|dt
+                                }}</a></td>
+                        <td>{{ other_activity.distance_km | round(1) }}</td>
+                        <td>{{ other_activity.elapsed_time|td }}</td>
+                        <td>{{ other_activity["equipment"] }}</td>
+                        <td>{{ other_activity["kind"] }}</td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
     </div>
 </div>
 {% endif %}

geo_activity_playground/webui/templates/activity/trim.html.j2

@@ -0,0 +1,68 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<div class="row mb-3">
+    <div class="col">
+        <h1>{{ activity["name"] }}</h1>
+    </div>
+</div>
+
+<a href="{{ url_for('.show', id=activity['id']) }}" class="btn btn-primary btn-small">Back</a>
+
+
+<div id="activity-map" style="height: 600px;" class="mb-3"></div>
+<script>
+    var map = L.map('activity-map', {
+        fullscreenControl: true
+    });
+    L.tileLayer('/tile/pastel/{z}/{x}/{y}.png', {
+        maxZoom: 19,
+        attribution: '{{ map_tile_attribution|safe }}'
+    }).addTo(map);
+
+
+    let layer = L.geoJSON({{ color_line_geojson| safe }}, {
+        pointToLayer: function (feature, lat_lon) {
+            let p = feature.properties
+
+            let marker = null
+            if (p.markerType == "circle") {
+                marker = L.circleMarker(lat_lon, p.markerStyle)
+            } else {
+                marker = L.marker(lat_lon)
+            }
+
+            let text = ''
+            if (p.name) {
+                text += `<p><b>${p.name}</b></p>`
+            }
+            if (p.description) {
+                text += p.description
+            }
+            if (text) {
+                marker = marker.bindPopup(text)
+            }
+
+            return marker
+        }
+    })
+
+    layer.addTo(map)
+    map.fitBounds(layer.getBounds());
+</script>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="begin" class="form-label">Begin</label>
+        <input type="number" class="form-control" id="begin" name="begin" value="{{ activity.index_begin }}" />
+    </div>
+
+    <div class="mb-3">
+        <label for="end" class="form-label">End</label>
+        <input type="number" class="form-control" id="end" name="end" value="{{ activity.index_end }}" />
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+{% endblock %}

geo_activity_playground/webui/templates/bubble_chart/index.html.j2

@@ -0,0 +1,26 @@
+<!-- filepath: /home/michael/Nextcloud/Python/Geoactivity-Fork/geo-activity-playground/geo_activity_playground/webui/templates/bubble_chart/index.html.j2 -->
+{% extends "page.html.j2" %}
+
+{% block container %}
+<div class="row mb-3">
+    <div class="col">
+        <h1>Bubble Chart</h1>
+        <div id="bubble-chart"></div>
+        <script src="https://cdn.jsdelivr.net/npm/vega@5"></script>
+        <script src="https://cdn.jsdelivr.net/npm/vega-lite@5"></script>
+        <script src="https://cdn.jsdelivr.net/npm/vega-embed@6"></script>
+        <script>
+            const chartSpec = {{ bubble_chart | safe }};
+            vegaEmbed('#bubble-chart', chartSpec).then((result) => {
+                // Add a click event listener to the chart
+                result.view.addEventListener('click', (event, item) => {
+                    if (item && item.datum && item.datum.activity_url) {
+                        // Redirect to the activity URL
+                        window.location.href = item.datum.activity_url;
+                    }
+                });
+            }).catch(console.error);
+        </script>
+    </div>
+</div>
+{% endblock %}

geo_activity_playground/webui/templates/calendar/index.html.j2

@@ -0,0 +1,48 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<div class="row mb-1">
+    <div class="col">
+        <h1>Calendar</h1>
+    </div>
+</div>
+
+<div class="row mb-1">
+    <div class="col">
+        <div class="table-responsive">
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th>Year</th>
+                        {% for i in range(1, 13) %}
+                        <th style="text-align: right;">{{ i }}</th>
+                        {% endfor %}
+                        <th style="text-align: right;">Total</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for year, month_data in monthly_distances.items() %}
+                    {% set year_int = year|round(0)|int %}
+                    <tr>
+                        <td>{{ year_int }}</td>
+                        {% for month in range(1, 13) %}
+                        <td align="right">
+                            {% set distance = month_data[month] %}
+                            {% if distance %}
+                            <a href="{{ url_for(".month", year=year_int, month=month) }}">{{ distance|int() }} km</a>
+                            {% else %}
+                            0 km
+                            {% endif %}
+                        </td>
+                        {% endfor %}
+                        <td align="right">{{ yearly_distances[year]|int() }} km</td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+
+
+{% endblock %}

geo_activity_playground/webui/templates/calendar/month.html.j2

@@ -0,0 +1,57 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<div class="row mb-1">
+    <div class="col">
+        <h1>Calendar {{ year }}-{{ "{0:02d}".format(month) }}</h1>
+    </div>
+</div>
+
+<div class="row mb-1">
+    <div class="col">
+        <div class="table-responsive">
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th>Week</th>
+                        <th>Monday</th>
+                        <th>Tuesday</th>
+                        <th>Wednesday</th>
+                        <th>Thursday</th>
+                        <th>Friday</th>
+                        <th>Saturday</th>
+                        <th>Sunday</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for week, week_data in weeks.items() %}
+                    <tr>
+                        <td>{{ week }}</td>
+                        {% for day in range(1, 8) %}
+                        <td>
+                            {% if weeks[week][day] %}
+                            <a href="{{ url_for('activity.day', year=year, month=month, day=day_of_month[week][day]) }}"><b>{{
+                                    day_of_month[week][day] }}.</b></a>
+                            {% elif day_of_month[week][day] %}
+                            <b>{{ day_of_month[week][day] }}.</b>
+                            {% endif %}
+
+                            {% if weeks[week][day] %}
+                            <ul>
+                                {% for activity in weeks[week][day] %}
+                                <li><a href="{{ url_for('activity.show', id=activity.id) }}">{{ activity.name }}</a></li>
+                                {% endfor %}
+                            </ul>
+                            {% endif %}
+                        </td>
+                        {% endfor %}
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+
+
+{% endblock %}

geo_activity_playground/webui/templates/equipment/index.html.j2

@@ -32,6 +32,13 @@
     </div>
 </div>
 
+<div class="row mb-3">
+    <div class="col">
+        <h2>Monthly Equipment Usage</h2>
+        {{ vega_direct("stacked_area_chart", stacked_area_chart) }}
+    </div>
+</div>
+
 <div class="row mb-3">
     <div class="col">
         <h2>Details for each equipment</h2>

geo_activity_playground/webui/templates/home.html.j2

@@ -13,11 +13,6 @@
 </div>
 
 
-<div class="row mb-3">
-    <div class="col">
-        <h2>Latest activities</h2>
-    </div>
-</div>
 
 <script>
     function add_map(id, geojson) {
@@ -35,7 +30,11 @@
     }
 </script>
 
-{% for activity_batch in latest_activities|batch(3) %}
+<h2>Latest activities</h2>
+
+{% for date, date_data in latest_activities.items() %}
+<h3>{{ date }}</h3>
+{% for activity_batch in date_data|batch(3) %}
 <div class="row row-cols-1 row-cols-md-3 g-4 mb-3">
     {% for elem in activity_batch %}
     <div class="col">
@@ -57,6 +56,7 @@
     {% endfor %}
 </div>
 {% endfor %}
+{% endfor %}
 {% else %}
 <p>You don't have activities yet. Either put some files into a directory <tt>Activities</tt>, <a
         href="{{ url_for('upload.index') }}">upload activities</a> or <a href="{{ url_for('settings.strava') }}">set up

geo_activity_playground/webui/templates/page.html.j2

@@ -64,6 +64,7 @@
                             <ul class="dropdown-menu">
                                 <li><a class="dropdown-item" href="{{ url_for('calendar.index') }}">Calendar</a></li>
                                 <li><a class="dropdown-item" href="{{ url_for('search.index') }}">Overview & Search</a>
+                                <li><a class="dropdown-item" href="{{ url_for('bubble_chart.index') }}">Bubble Chart</a>
                                 </li>
                             </ul>
                         </li>
@@ -195,7 +196,7 @@
 
         <div class="row border-top py-3 my-4">
             <ul class="nav col-4">
-                <li class="nav-item text-muted px-2 nav-link">Version {{ version }}</li>
+                <li class="nav-item px-2 nav-link"><a href="https://github.com/martin-ueding/geo-activity-playground/blob/main/docs/changelog.md" class="nav-link px-2 text-muted" target="_blank">Version {{ version }}</a></li>
             </ul>
             <ul class="nav col-8 justify-content-end">
                 <li class="nav-item"><a href="https://github.com/martin-ueding/geo-activity-playground"