feat: Enhance activity listing and statistics retrieval with pagination and quality filter options
Deploy Development / deploy (push) Successful in 48s
Build Test / pytest-backend (push) Successful in 5s
Build Test / lint-backend (push) Successful in 0s
Build Test / build-frontend (push) Successful in 16s

- Added pagination support to the activity listing endpoint with `limit` and `offset` parameters.
- Introduced a `skip_quality_filter` option to allow retrieval of all entries without applying the quality filter.
- Updated the frontend to implement dynamic loading of activity entries and statistics without the quality filter.
- Improved user experience with a "Load More" button for fetching additional entries on the ActivityPage.
This commit is contained in:
Lars committed 2026-04-14 14:11:01 +02:00
1 parent 766b64cd64
commit 1f51c32521
3 files changed
+108 -22

No files matched your search

+64 -7
View File
@@ -1,4 +1,4 @@
import { useState, useEffect, useRef, startTransition } from 'react'
import { useState, useEffect, useRef, useCallback, startTransition } from 'react'
import { Upload, Pencil, Trash2, Check, X, CheckCircle } from 'lucide-react'
import { BarChart, Bar, XAxis, YAxis, Tooltip, ResponsiveContainer, CartesianGrid } from 'recharts'
import { api } from '../utils/api'
@@ -9,6 +9,9 @@ import dayjs from 'dayjs'
import 'dayjs/locale/de'
dayjs.locale('de')
/** Erfassungsseite /activity: erste Ladung + „Mehr laden“ (ohne Qualitätsfilter, siehe Backend). */
const ACTIVITY_LIST_PAGE_SIZE = 40
const ACTIVITY_TYPES = [
'Traditionelles Krafttraining','Matrial Arts','Outdoor Spaziergang',
'Innenräume Spaziergang','Laufen','Radfahren','Schwimmen',
@@ -299,12 +302,48 @@ export default function ActivityPage() {
const [metricDraft, setMetricDraft] = useState({})
const [sessionLoadError, setSessionLoadError] = useState(null)
const [savingEdit, setSavingEdit] = useState(false)
const [listHasMore, setListHasMore] = useState(false)
const [listLoadingMore, setListLoadingMore] = useState(false)
const load = async () => {
const [e, s] = await Promise.all([api.listActivity(), api.activityStats()])
setEntries(e); setStats(s)
const loadFirstPage = useCallback(async () => {
const n = ACTIVITY_LIST_PAGE_SIZE
const [e, s] = await Promise.all([
api.listActivity(n, undefined, { skipQualityFilter: true, offset: 0 }),
api.activityStats({ skipQualityFilter: true }),
])
setEntries(e)
setStats(s)
setListHasMore(e.length === n)
}, [])
const entriesRef = useRef(entries)
useEffect(() => {
entriesRef.current = entries
}, [entries])
const loadMore = async () => {
if (listLoadingMore || !listHasMore) return
setListLoadingMore(true)
try {
const n = ACTIVITY_LIST_PAGE_SIZE
const offset = entriesRef.current.length
const more = await api.listActivity(n, undefined, {
skipQualityFilter: true,
offset,
})
if (more.length === 0) {
setListHasMore(false)
return
}
setEntries((prev) => [...prev, ...more])
setListHasMore(more.length === n)
} finally {
setListLoadingMore(false)
}
}
const load = loadFirstPage
const loadUsage = () => {
api.getFeatureUsage().then(features => {
const activityFeature = features.find(f => f.feature_id === 'activity_entries')
@@ -312,11 +351,11 @@ export default function ActivityPage() {
}).catch(err => console.error('Failed to load usage:', err))
}
useEffect(()=>{
load()
useEffect(() => {
void loadFirstPage()
loadUsage()
api.getTrainingCategories().then(setCategories).catch(err => console.error('Failed to load categories:', err))
},[])
}, [loadFirstPage])
useEffect(() => {
if (!editing?.id) {
@@ -536,6 +575,11 @@ export default function ActivityPage() {
{tab==='list' && (
<div>
<p style={{ fontSize: 12, color: 'var(--text3)', margin: '0 0 12px', lineHeight: 1.5 }}>
Hier sind <strong>alle</strong> Trainings sichtbar (Profil-Qualitätsfilter aus — auch ohne Bewertung oder bei
abweichender Einordnung). Unter „Verlauf“ / Auswertung bleibt der Filter aktiv. Es werden jeweils bis zu{' '}
{ACTIVITY_LIST_PAGE_SIZE} Einträge nachgeladen.
</p>
{entries.length===0 && (
<div className="empty-state">
<h3>Keine Trainings</h3>
@@ -678,6 +722,19 @@ export default function ActivityPage() {
</div>
)
})}
{listHasMore && (
<div style={{ marginTop: 12, marginBottom: 8 }}>
<button
type="button"
className="btn btn-secondary"
style={{ width: '100%' }}
disabled={listLoadingMore}
onClick={() => void loadMore()}
>
{listLoadingMore ? 'Lade…' : 'Weitere Einträge laden'}
</button>
</div>
)}
</div>
)}
</div>
+15 -3
View File
@@ -138,16 +138,28 @@ export const api = {
deleteCaliper: (id) => req(`/caliper/${id}`,{method:'DELETE'}),
// Activity
/** @param {number} [limit=200] @param {number} [days] nur Einträge ab HEUTE−days (Kalendertage), backend-filtert */
listActivity: (limit=200, days)=> {
/**
* @param {number} [limit=200]
* @param {number} [days] nur Einträge ab HEUTE−days (Kalendertage), backend-filtert
* @param {{ offset?: number, skipQualityFilter?: boolean }} [opts]
*/
listActivity: (limit=200, days, opts={})=> {
const q = new URLSearchParams({ limit: String(limit) })
if (days != null && days !== '') q.set('days', String(days))
if (opts.offset != null && opts.offset > 0) q.set('offset', String(opts.offset))
if (opts.skipQualityFilter) q.set('skip_quality_filter', 'true')
return req(`/activity?${q}`)
},
createActivity: (d) => req('/activity',json(d)),
updateActivity: (id,d) => req(`/activity/${id}`,jput(d)),
deleteActivity: (id) => req(`/activity/${id}`,{method:'DELETE'}),
activityStats: () => req('/activity/stats'),
/** @param {{ skipQualityFilter?: boolean }} [opts] */
activityStats: (opts={}) => {
const q = new URLSearchParams()
if (opts.skipQualityFilter) q.set('skip_quality_filter', 'true')
const qs = q.toString()
return req(`/activity/stats${qs ? `?${qs}` : ''}`)
},
listUncategorizedActivities: () => req('/activity/uncategorized'),
bulkCategorizeActivities: (d) => req('/activity/bulk-categorize', json(d)),
importActivityCsv: async(file)=>{