+
{{ $t('socialnetwork.vocab.courses.noVocabInfo') }}
@@ -830,7 +833,7 @@ export default {
return 1;
},
trainerNewFocusTarget() {
- const vocabCount = this.importantVocab?.length || 0;
+ const vocabCount = this.trainableLessonVocab?.length || 0;
const exerciseCount = this.effectiveExercises?.length || 0;
const durationBonus = Math.max(0, Math.round((this.lesson?.targetMinutes || 0) / 5) - 1);
const baseTarget = Math.ceil((Math.max(vocabCount, 4) * 1.35) + (exerciseCount * 0.35) + durationBonus);
@@ -858,9 +861,16 @@ export default {
canAccessExercises() {
if (!this.hasExercises) return false;
const isReview = this.lesson?.lessonType === 'review' || this.lesson?.lessonType === 'vocab_review';
- return isReview || this.exercisePreparationCompleted;
+ if (isReview) return true;
+ if (this.trainableLessonVocab.length === 0 && this.prepItems.length > 0) {
+ return this.lessonPrepStage >= 2;
+ }
+ return this.exercisePreparationCompleted;
},
exerciseUnlockHint() {
+ if (this.trainableLessonVocab.length === 0 && this.prepItems.length > 0) {
+ return this.$t('socialnetwork.vocab.courses.exerciseUnlockHintAfterPrep');
+ }
if (this.hasPreviousVocab) {
return `Lerne zuerst die neuen Inhalte der Lektion und arbeite dich durch ungefähr ${this.trainerExerciseUnlockAttempts} Trainerfragen. Ältere Vokabeln werden dabei nach und nach zugemischt.`;
}
@@ -931,6 +941,39 @@ export default {
return [];
}
},
+ lessonVocab() {
+ const vocabByReference = new Map();
+ const addEntry = (entry) => {
+ const reference = String(entry?.reference || '').trim();
+ const learning = String(entry?.learning || '').trim();
+ if (!reference) return;
+ const key = reference.toLowerCase();
+ if (!vocabByReference.has(key)) {
+ vocabByReference.set(key, { learning, reference });
+ return;
+ }
+ const existing = vocabByReference.get(key);
+ if (!existing.learning && learning) {
+ existing.learning = learning;
+ }
+ };
+
+ this.normalizedCorePatterns.forEach((item) => {
+ addEntry({
+ learning: item.gloss || '',
+ reference: item.target || ''
+ });
+ });
+
+ this.importantVocab.forEach((item) => {
+ addEntry(item);
+ });
+
+ return Array.from(vocabByReference.values());
+ },
+ trainableLessonVocab() {
+ return this.lessonVocab.filter((entry) => entry.learning && entry.reference && entry.learning !== entry.reference);
+ },
lessonDidactics() {
return this.lesson?.didactics || {
learningGoals: [],
@@ -947,21 +990,7 @@ export default {
.filter(Boolean);
},
prepItems() {
- if (this.normalizedCorePatterns.length > 0) {
- const glossByReference = new Map(
- (this.importantVocab || [])
- .map((item) => [String(item?.reference || '').trim().toLowerCase(), String(item?.learning || '').trim()])
- .filter(([reference, learning]) => reference && learning)
- );
- return this.normalizedCorePatterns.map((item) => {
- if (item.gloss) {
- return item;
- }
- const gloss = glossByReference.get(String(item.target || '').trim().toLowerCase()) || '';
- return gloss ? { ...item, gloss } : item;
- });
- }
- return (this.importantVocab || [])
+ return this.lessonVocab
.map((item) => ({
target: String(item?.reference || '').trim(),
gloss: String(item?.learning || '').trim()
@@ -981,7 +1010,7 @@ export default {
return this.normalizedCorePatterns.some((p) => p.gloss);
},
canStartVocabTrainerPrep() {
- if (!this.importantVocab || this.importantVocab.length === 0) {
+ if (!this.trainableLessonVocab || this.trainableLessonVocab.length === 0) {
return false;
}
if (this.prepItems.length > 0 && this.lessonPrepStage < 2) {
@@ -1794,17 +1823,17 @@ export default {
// Vokabeltrainer-Methoden
startVocabTrainer() {
debugLog('[VocabLessonView] startVocabTrainer aufgerufen');
- if (!this.importantVocab || this.importantVocab.length === 0) {
+ if (!this.trainableLessonVocab || this.trainableLessonVocab.length === 0) {
debugLog('[VocabLessonView] Keine Vokabeln vorhanden');
return;
}
if (!this.canStartVocabTrainerPrep) {
return;
}
- debugLog('[VocabLessonView] Vokabeln gefunden:', this.importantVocab.length);
+ debugLog('[VocabLessonView] Vokabeln gefunden:', this.trainableLessonVocab.length);
debugLog('[VocabLessonView] Alte Vokabeln:', this.previousVocab?.length || 0);
this.vocabTrainerActive = true;
- this.vocabTrainerPool = [...this.importantVocab];
+ this.vocabTrainerPool = [...this.trainableLessonVocab];
this.vocabTrainerMode = 'multiple_choice';
this.vocabTrainerAutoSwitchedToTyping = false;
this.vocabTrainerCorrect = 0;
@@ -1817,7 +1846,7 @@ export default {
this.vocabTrainerMixedPool = this._buildMixedPool();
this.vocabTrainerPhase = 'current';
this.vocabTrainerMixedAttempts = 0;
- this.vocabTrainerPool = [...this.importantVocab];
+ this.vocabTrainerPool = [...this.trainableLessonVocab];
debugLog('[VocabLessonView] Mixed-Pool:', this.vocabTrainerMixedPool.length, 'Vokabeln');
debugLog('[VocabLessonView] Rufe nextVocabQuestion auf');
this.$nextTick(() => {
@@ -1841,7 +1870,7 @@ export default {
/** Erstellt den Mixed-Pool aus vorherigen Lektions-Vokabeln (ohne Duplikate der aktuellen Lektion) */
_buildMixedPool() {
if (!this.previousVocab || this.previousVocab.length === 0) return [];
- const currentKeys = new Set(this.importantVocab.map(v => this.getVocabKey(v)));
+ const currentKeys = new Set(this.trainableLessonVocab.map(v => this.getVocabKey(v)));
const filtered = this.previousVocab.filter(v => !currentKeys.has(this.getVocabKey(v)));
// Zufällig mischen und auf 40 begrenzen
const shuffled = [...filtered].sort(() => Math.random() - 0.5);
@@ -1868,7 +1897,7 @@ export default {
debugLog('[VocabLessonView] Mixed-Phase abgeschlossen, wechsle zu Typing');
this.vocabTrainerMode = 'typing';
this.vocabTrainerAutoSwitchedToTyping = true;
- this.vocabTrainerPool = [...this.importantVocab, ...this.vocabTrainerMixedPool];
+ this.vocabTrainerPool = [...this.trainableLessonVocab, ...this.vocabTrainerMixedPool];
this.vocabTrainerCorrect = 0;
this.vocabTrainerWrong = 0;
this.vocabTrainerTotalAttempts = 0;
@@ -1880,8 +1909,8 @@ export default {
this.vocabTrainerMode = 'multiple_choice';
this.vocabTrainerAutoSwitchedToTyping = false;
this.vocabTrainerPool = this.vocabTrainerPhase === 'mixed'
- ? [...this.importantVocab, ...this.vocabTrainerMixedPool]
- : [...this.importantVocab];
+ ? [...this.trainableLessonVocab, ...this.vocabTrainerMixedPool]
+ : [...this.trainableLessonVocab];
// Reset Stats für Multiple Choice Modus
this.vocabTrainerCorrect = 0;
this.vocabTrainerWrong = 0;
@@ -1988,7 +2017,7 @@ export default {
this.checkVocabModeSwitch();
let questionSource = 'current';
- let sourcePool = this.importantVocab;
+ let sourcePool = this.trainableLessonVocab;
if (this.vocabTrainerMode === 'typing') {
sourcePool = this.vocabTrainerPool;
@@ -2001,14 +2030,14 @@ export default {
}
if (!sourcePool || sourcePool.length === 0) {
- sourcePool = this.importantVocab;
+ sourcePool = this.trainableLessonVocab;
questionSource = 'current';
}
const randomIndex = Math.floor(Math.random() * sourcePool.length);
const vocab = sourcePool[randomIndex];
this.vocabTrainerDirection = Math.random() < 0.5 ? 'L2R' : 'R2L';
- const allTrainerVocabs = [...this.importantVocab, ...this.vocabTrainerMixedPool];
+ const allTrainerVocabs = [...this.trainableLessonVocab, ...this.vocabTrainerMixedPool];
const prompt = this.vocabTrainerDirection === 'L2R' ? vocab.learning : vocab.reference;
const acceptableAnswers = this.getEquivalentVocabAnswers(
prompt,
@@ -2795,6 +2824,17 @@ export default {
margin: 20px 0;
}
+.vocab-list__summary {
+ cursor: pointer;
+ font-weight: 600;
+ color: #5f4313;
+ margin-bottom: 12px;
+}
+
+.vocab-list[open] .vocab-list__summary {
+ margin-bottom: 14px;
+}
+
.vocab-list h4 {
margin-bottom: 15px;
color: #333;