Baue den Aufbauarbeitsplatz nach dem kombinierten Entwurf um.
Struktur links mit Position, Ziehgriff, aufklappbarem Quelleninhalt und Auf/Ab für die ausgewählte Verwendung; rechts der Detailbereich mit „An dieser Stelle“ (Rolle, Hinweis, Fassung), „Quelle“ und „Inhaltsvorschau“. Didaktik und Katalogbild sowie Fassungen und Verwendung sind eigene Bereiche statt Dialog und Seitenspalte. Freigabe- und Textdialog nutzen den gemeinsamen Dialog. Entfernt verdeckte Speicherungen: Hinzufügen eines Bestandteils speichert den Entwurf nicht mehr nebenbei (Ausnahme: ausdrückliches „Zurück und einbinden“), der Textwortlaut wird an der Quelle gespeichert, ohne den Aufbau mitzuspeichern. Der Mediendialog „Angaben und Vorschaubild“ war ein zweiter Editor für Medientexte und weicht „Quelle bearbeiten“. Vorhandene Bilder als Katalogbild kommen über den gemeinsamen Picker. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
156cdd6976
commit
7eb3cd6230
11 files changed
+840
-743
No files matched your search
@@ -344,10 +344,11 @@ public function test_catalog_cards_show_text_status_and_a_single_film_suggestion
|
||||
|
||||
Livewire::actingAs($editor, 'staff')
|
||||
->test(EditExercise::class, ['record' => $withFilm->composition_id])
|
||||
->assertSee('In Mitgliederbibliothek anzeigen')
|
||||
->assertSee('Aus Mitgliederbibliothek ausblenden')
|
||||
->call('openModule')
|
||||
->assertSee('Vorschlag aus dem Film Lara im Park')
|
||||
->assertSee('Katalogbild')
|
||||
->assertSee('Didaktik und Katalogbild bearbeiten')
|
||||
->assertSee('Didaktik und Katalogbild')
|
||||
->assertDontSee('Anzeige speichern')
|
||||
->assertDontSee('Zur Anzeige freigeben');
|
||||
}
|
||||
@@ -370,9 +371,9 @@ public function test_a_chosen_picture_and_description_do_not_create_a_version():
|
||||
Livewire::actingAs($editor, 'staff')
|
||||
->test(EditExercise::class, ['record' => $version->composition_id])
|
||||
->call('openModule')
|
||||
->set('moduleTab', 'titelbild')
|
||||
->assertSee('Aus Film')
|
||||
->assertSee('Vorhandenes Bild')
|
||||
->assertSet('aufbauTab', 'angaben')
|
||||
->assertSee('Aus einem Film')
|
||||
->assertSee('Bild aus dem Bestand wählen')
|
||||
->assertSee('Hochladen')
|
||||
->assertSee('Lara im Park')
|
||||
->assertSee('Lara im Hof')
|
||||
@@ -413,9 +414,9 @@ public function test_texts_save_in_the_redaktion_and_the_dialog_keeps_didactics_
|
||||
->call('openModule')
|
||||
->assertSee('Didaktik')
|
||||
->assertSee('Katalogbild')
|
||||
->assertSee('Name, Texte und Einordnung bearbeitest du in der Redaktion.')
|
||||
->assertSee('Name, Texte, Präsentationsmedien und Einordnung bearbeitest du in der Redaktion.')
|
||||
->set('learningGoal', 'Weg damit')
|
||||
->call('closeModule')
|
||||
->call('discardDraft')
|
||||
->assertSet('learningGoal', '');
|
||||
|
||||
Livewire::actingAs($editor, 'staff')
|
||||
@@ -435,7 +436,7 @@ public function test_texts_save_in_the_redaktion_and_the_dialog_keeps_didactics_
|
||||
->test(EditExercise::class, ['record' => $version->composition_id])
|
||||
->set('learningGoal', 'Nur im Entwurf')
|
||||
->set('durationMinutes', '9')
|
||||
->call('saveModule');
|
||||
->call('saveDraft');
|
||||
|
||||
$composition->refresh();
|
||||
$this->assertSame(1, $composition->versions()->count());
|
||||
@@ -466,7 +467,9 @@ public function test_the_picker_groups_versions_and_adopts_the_chosen_one(): voi
|
||||
->assertSee('Fassung 1')
|
||||
->assertSee('aktueller Stand')
|
||||
->set('pickerSelected', 'element:'.$first->id)
|
||||
->call('addPart', 'element:'.$first->id);
|
||||
->call('addPart', 'element:'.$first->id)
|
||||
->assertSee('Gespeichert wird mit „Entwurf speichern“')
|
||||
->call('saveDraft');
|
||||
$module->refresh();
|
||||
$this->assertSame(0, $module->versions()->count());
|
||||
$this->assertSame('element:'.$first->id, $module->working_draft['members'][0]['target']);
|
||||
@@ -499,13 +502,14 @@ public function test_the_picker_includes_draft_media(): void
|
||||
$component
|
||||
->set('pickerSelected', 'element:'.$onlyDraft->id)
|
||||
->assertSee('Felix beim Onkel')
|
||||
->call('addPart', 'element:'.$onlyDraft->id);
|
||||
->call('addPart', 'element:'.$onlyDraft->id)
|
||||
->call('saveDraft');
|
||||
|
||||
$this->assertSame('element:'.$onlyDraft->id, $module->fresh()->working_draft['members'][0]['target']);
|
||||
$this->assertSame(ContentVersionStatus::Entwurf, $onlyDraft->fresh()->status);
|
||||
}
|
||||
|
||||
public function test_the_part_dialog_saves_a_role_without_a_new_version(): void
|
||||
public function test_a_local_role_is_edited_in_place_and_saved_with_the_draft(): void
|
||||
{
|
||||
$content = app(ContentService::class);
|
||||
$sheet = $content->publishElementVersion($content->createElement('text', 'text', 'Blatt'), 'Hinweis');
|
||||
@@ -516,11 +520,12 @@ public function test_the_part_dialog_saves_a_role_without_a_new_version(): void
|
||||
|
||||
Livewire::actingAs($this->editor(), 'staff')
|
||||
->test(EditExercise::class, ['record' => $version->composition_id])
|
||||
->call('openPart', 0)
|
||||
->assertSee('Bestandteil bearbeiten')
|
||||
->assertSet('selected', 0)
|
||||
->assertSee('An dieser Stelle')
|
||||
->assertSee('Gilt nur hier. Die Quelle bleibt unverändert.')
|
||||
->set('roleDraft', 'Einstieg')
|
||||
->call('savePart')
|
||||
->assertSet('partOpen', false)
|
||||
->assertSee('Änderungen am Aufbau nicht gespeichert')
|
||||
->call('saveDraft')
|
||||
->assertSee('Es entsteht keine neue Fassung');
|
||||
|
||||
$composition = $version->composition->fresh();
|
||||
@@ -556,8 +561,8 @@ public function test_a_missing_film_frame_does_not_create_a_version(): void
|
||||
->set('imageMode', 'film')
|
||||
->set('frameVersionId', $film->id)
|
||||
->set('frameSecond', '4.5')
|
||||
->call('saveModule')
|
||||
->assertSet('moduleOpen', true);
|
||||
->call('saveCatalogImage')
|
||||
->assertSet('aufbauTab', 'angaben');
|
||||
|
||||
$composition = $version->composition->fresh();
|
||||
$film->refresh();
|
||||
@@ -579,10 +584,10 @@ public function test_a_placement_note_waits_for_release_and_keeps_the_old_versio
|
||||
|
||||
Livewire::actingAs($this->editor(), 'staff')
|
||||
->test(EditExercise::class, ['record' => $version->composition_id])
|
||||
->call('openPart', 0)
|
||||
->assertSee('Beschreibung an dieser Stelle')
|
||||
->call('selectPart', 0)
|
||||
->assertSee('Hinweis an dieser Stelle')
|
||||
->set('noteDraft', 'Hier zuerst den Abstand ansprechen.')
|
||||
->call('savePart')
|
||||
->call('saveDraft')
|
||||
->assertSee('Es entsteht keine neue Fassung')
|
||||
->call('publishRevision');
|
||||
|
||||
@@ -603,13 +608,13 @@ public function test_a_module_text_stays_editable_until_it_is_released_and_used(
|
||||
->set('newTextTitle', 'Hinweis')
|
||||
->set('newTextBody', 'Erster Wortlaut')
|
||||
->call('addText')
|
||||
->assertSee('Vorschau: Hinweis')
|
||||
->assertSee('das Auge öffnet eine Vorschau')
|
||||
->assertDontSee('Das Stiftsymbol öffnet die Bearbeitung')
|
||||
->call('openPart', 0)
|
||||
->assertSee('Hinweis')
|
||||
->call('saveDraft')
|
||||
->call('selectPart', 0)
|
||||
->set('detailTab', 'quelle')
|
||||
->assertSee('dieselbe Fassung fort')
|
||||
->set('partBody', 'Geänderter Wortlaut')
|
||||
->call('savePart')
|
||||
->call('saveSourceText')
|
||||
->assertSee('derselben Fassung');
|
||||
|
||||
$element = ContentElement::query()->where('working_title', 'Hinweis')->firstOrFail();
|
||||
@@ -630,10 +635,12 @@ public function test_a_module_text_stays_editable_until_it_is_released_and_used(
|
||||
$this->assertSame($version->id, $module->fresh()->versions()->first()->members()->first()->content_element_version_id);
|
||||
|
||||
$component
|
||||
->call('openPart', 0)
|
||||
->call('selectPart', 0)
|
||||
->set('detailTab', 'quelle')
|
||||
->set('partBody', 'Nach der Freigabe')
|
||||
->call('savePart')
|
||||
->assertSee('neuen Fassung');
|
||||
->call('saveSourceText')
|
||||
->assertSee('neuen Fassung')
|
||||
->call('saveDraft');
|
||||
|
||||
$this->assertSame(2, $element->fresh()->versions()->count());
|
||||
$this->assertSame('Geänderter Wortlaut', $version->fresh()->body);
|
||||
@@ -656,9 +663,9 @@ public function test_a_file_can_be_created_inside_the_module(): void
|
||||
|
||||
$component = Livewire::actingAs($editor, 'staff')
|
||||
->test(EditExercise::class, ['record' => $module->id])
|
||||
->assertSee('Medium anlegen')
|
||||
->call('openPicker')
|
||||
->assertSee('Bestandteil auswählen')
|
||||
->assertSee('Neues Medium anlegen')
|
||||
->mountAction('createMedium')
|
||||
->assertSet('pickerOpen', false)
|
||||
->assertMountedActionModalSee('Vorschaubild')
|
||||
@@ -687,17 +694,13 @@ public function test_a_file_can_be_created_inside_the_module(): void
|
||||
$this->assertIsString($version->metadata['file'] ?? null);
|
||||
Storage::disk('media_derived')->assertExists($version->metadata['file']);
|
||||
|
||||
// Angaben des Mediums bearbeitet seine eigene Redaktion; der Aufbau verweist nur darauf.
|
||||
$component
|
||||
->mountAction('editMedium', ['element' => $element->id])
|
||||
->assertMountedActionModalSee('Vorschaubild')
|
||||
->fillForm([
|
||||
'working_title' => 'Merkblatt',
|
||||
'description' => 'Überarbeitet',
|
||||
'usage_note' => 'Vorher lesen',
|
||||
])
|
||||
->callMountedAction();
|
||||
->call('saveDraft')
|
||||
->set('detailTab', 'quelle')
|
||||
->assertSee('Quelle bearbeiten')
|
||||
->assertSee(ContentElementResource::getUrl('view', ['record' => $element]), false);
|
||||
|
||||
$this->assertSame('Überarbeitet', $element->fresh()->description);
|
||||
$this->assertSame(1, $element->versions()->count());
|
||||
|
||||
$component->set('releaseConsent', true)->call('publishRevision');
|
||||
@@ -735,6 +738,7 @@ public function test_release_reviews_the_structure_and_keeps_other_references():
|
||||
->call('armRelease')
|
||||
->call('publishRevision')
|
||||
->assertSee('Fassung 1 ist freigegeben')
|
||||
->call('showAufbauTab', 'verlauf')
|
||||
->assertSee('keinen offenen Entwurf')
|
||||
->assertSee('In Mitgliederbibliothek anzeigen');
|
||||
|
||||
@@ -800,7 +804,8 @@ public function test_release_reviews_the_structure_and_keeps_other_references():
|
||||
$broken = $content->createComposition('Mit Fehler', CompositionKind::Uebung);
|
||||
$brokenEditor = Livewire::actingAs($editor, 'staff')
|
||||
->test(EditExercise::class, ['record' => $broken->id])
|
||||
->call('addPart', 'element:'.$soonBlocked->id);
|
||||
->call('addPart', 'element:'.$soonBlocked->id)
|
||||
->call('saveDraft');
|
||||
$content->block($soonBlocked, 'Nicht mehr verwenden');
|
||||
$brokenEditor
|
||||
->call('armRelease')
|
||||
|
||||
Reference in new issue
Block a user