torsten/yourpart3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: verbessere SRS-Logik und füge serverseitige Zählung für fällige Items hinzu
Some checks failed
Deploy to production / deploy (push) Failing after 1m50s
Details

Browse Source
This commit is contained in:
Torsten Schulz (local)
2026-06-03 16:39:12 +02:00
parent a4c053df3e
commit 8b0aa94715
2 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
frontend/src/dialogues/socialnetwork/VocabPracticeDialog.vue
View File

@@ -28,7 +28,7 @@
<div v-else-if="pool.length === 0">
{{ $t('socialnetwork.vocab.practice.noPool') }}
</div>
<div v-else-if="srsMode && srsQueueIds.length === 0" class="srs-finished">
<div v-else-if="srsMode && srsRemainingCount === 0" class="srs-finished">
<div class="srs-finished__title">{{ $t('socialnetwork.vocab.practice.srsFinishedTitle') }}</div>
<div class="srs-finished__desc">{{ $t('socialnetwork.vocab.practice.srsFinishedDesc') }}</div>
</div>
@@ -180,6 +180,7 @@ export default {
// Stored per day and course so the user can close/reopen without starting over.
srsSession: null, // { version, dateKey, courseId, initialTotalDue, initialDueIds, doneIds, correctCount, wrongCount }
srsQueueIds: [], // remaining due ids for this session, in due order
srsServerTotalDue: null,
// session stats
correctCount: 0,
@@ -517,7 +518,8 @@ export default {
version: SRS_SESSION_STORAGE_VERSION,
dateKey: this.getLocalDateKey(),
courseId: this.openParams.courseId,
initialTotalDue: dueIds.length,
// Prefer server-reported total due count when available (shows full-course due count)
initialTotalDue: Number.isFinite(Number(this.srsServerTotalDue)) ? Number(this.srsServerTotalDue) : dueIds.length,
initialDueIds: dueIds,
doneIds: [],
correctCount: 0,
@@ -761,9 +763,29 @@ export default {
this.next();
return;
}
this.loading = true;
this.loading = true;
try {
let res;
let courseDueRes = null;
// Wenn SRS-Modus auf Kurs-Ebene, lade kursweite fällige Items (Server liefert totalDueCount)
if (this.srsMode && this.openParams.courseId && !this.openParams.lessonId) {
try {
courseDueRes = await apiClient.get(`/api/vocab/courses/${this.openParams.courseId}/srs/due`, { params: { limit: 100 } });
} catch (e) {
// ignore, fallback to lesson/chapters/vocabs endpoints
courseDueRes = null;
}
}
if (courseDueRes && Array.isArray(courseDueRes.data?.items) && courseDueRes.data.items.length > 0) {
// Map server items to pool shape (use itemKey as id)
this.pool = this.normalizePool((courseDueRes.data.items || []).map((it) => ({
id: it.itemKey,
learning: it.learning,
reference: it.reference,
lessonId: it.lessonId || null
})));
this.srsServerTotalDue = Number.isFinite(Number(courseDueRes.data?.totalDueCount)) ? Number(courseDueRes.data.totalDueCount) : null;
} else {
if (this.openParams.lessonId) {
if (this.allVocabs && this.openParams.courseId) {
res = await apiClient.get(`/api/vocab/courses/${this.openParams.courseId}/completed-lesson-vocabs`, {
@@ -782,7 +804,7 @@ export default {
} else {
res = await apiClient.get(`/api/vocab/chapters/${this.openParams.chapterId}/vocabs`);
this.pool = this.normalizePool(res.data?.vocabs || []);
}
}
} catch (e) {
console.error('Reload pool failed:', e);
this.pool = [];