Zeige Nutzbarkeit, Didaktik und oeffentliche Programmfassung
Deploy Test / test (push) Successful in 17s
Deploy Test / deploy (push) Successful in 22s

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
LarsandCursor committed 2026-11-16 08:33:19 +01:00
1 parent 5e763d15ec
commit c99a957e6f
17 files changed
+307 -6

No files matched your search

+4
View File
@@ -12,6 +12,10 @@ class Composition extends Model
'designation',
'display_title',
'summary',
'thumbnail_path',
'thumbnail_alt',
'thumbnail_error',
'public_slug',
'kind',
'editorial_content_kind_id',
'archived_at',
@@ -14,6 +14,9 @@ class CompositionVersion extends Model
'status',
'members_hash',
'resolved_hash',
'learning_goal',
'duration_minutes',
'material_note',
];
protected function casts(): array
+3
View File
@@ -16,6 +16,9 @@ class ContentElement extends Model
'display_title',
'description',
'summary',
'thumbnail_path',
'thumbnail_alt',
'thumbnail_error',
'editorial_content_kind_id',
'archived_at',
];
+16 -1
View File
@@ -86,6 +86,7 @@ public function publishComposition(
array $members,
?User $confirmedBy = null,
?string $note = null,
array $didactic = [],
): CompositionVersion {
if ($members === []) {
throw new DomainRuleException('Eine Komposition braucht mindestens ein Mitglied.');
@@ -97,13 +98,16 @@ public function publishComposition(
$this->assertReadyMember($member['target']);
}
return DB::transaction(function () use ($composition, $members, $confirmedBy, $note): CompositionVersion {
return DB::transaction(function () use ($composition, $members, $confirmedBy, $note, $didactic): CompositionVersion {
$number = ((int) $composition->versions()->max('number')) + 1;
$version = $composition->versions()->create([
'number' => $number,
'status' => ContentVersionStatus::Entwurf,
'members_hash' => $this->membersHash($members),
'resolved_hash' => 'pending',
'learning_goal' => $this->optionalText($didactic['learning_goal'] ?? null),
'duration_minutes' => isset($didactic['duration_minutes']) ? (int) $didactic['duration_minutes'] : null,
'material_note' => $this->optionalText($didactic['material_note'] ?? null),
]);
foreach (array_values($members) as $index => $member) {
@@ -219,6 +223,17 @@ private function membersHash(array $members): string
return hash('sha256', json_encode($list, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE));
}
private function optionalText(mixed $value): ?string
{
if (! is_string($value)) {
return null;
}
$value = trim($value);
return $value === '' ? null : $value;
}
private function required(string $value, string $message): string
{
$value = trim($value);
@@ -5,6 +5,7 @@
use App\Domain\Catalog\Composition;
use App\Domain\Catalog\CompositionDisplayRelease;
use App\Domain\Catalog\CompositionKind;
use App\Domain\Catalog\CompositionMember;
use App\Domain\Catalog\CompositionVersion;
use App\Domain\Catalog\ContentElementVersion;
use App\Domain\Catalog\ContentService;
@@ -56,6 +57,20 @@ public function form(Schema $schema): Schema
->options(fn (): array => EditorialContentKind::selectOptions())
->nullable()
->helperText('Optional für Bibliothek und Website. Ändert weder die technische Art noch eine Fassung.'),
Placeholder::make('usage')->label('Verwendung')->content(function (): HtmlString {
$version = $this->currentReadyVersion();
if ($version === null) {
return new HtmlString('Noch keine Fassung.');
}
$lines = CompositionMember::query()
->where('nested_composition_version_id', $version->id)
->with('compositionVersion.composition')
->get()
->map(fn (CompositionMember $member): string => ($member->compositionVersion->composition->designation ?? 'Programm').' · '.$member->role)
->all();
return new HtmlString($lines === [] ? 'In keiner anderen Fassung enthalten.' : e(implode(' · ', $lines)));
}),
Placeholder::make('history')->label('Aktuelle Fassung')->content(function (): HtmlString {
/** @var Composition $composition */
$composition = $this->getRecord();
@@ -160,6 +160,7 @@ public function media(
return view('member.read', [
'article' => $article,
'version' => $version,
'license' => $decision->grant?->rights_snapshot['purpose'] ?? null,
]);
}
@@ -0,0 +1,38 @@
<?php
namespace App\Http\Controllers;
use App\Domain\Catalog\Composition;
use App\Domain\Catalog\CompositionDisplayRelease;
use App\Domain\Catalog\CompositionStructureReader;
use App\Domain\Catalog\EditorialContentKind;
use Illuminate\View\View;
class PublicCatalogController extends Controller
{
public function index(): View
{
$kind = EditorialContentKind::query()->where('slug', 'programm')->first();
$programs = Composition::query()
->when($kind !== null, fn ($query) => $query->where('editorial_content_kind_id', $kind->id))
->orderBy('designation')
->get()
->filter(fn (Composition $composition): bool => app(CompositionDisplayRelease::class)->highestReleasedVersion($composition) !== null);
return view('public.programs', ['programs' => $programs]);
}
public function program(Composition $composition): View
{
$kind = $composition->editorialContentKind;
abort_unless($kind?->slug === 'programm', 404);
$version = app(CompositionDisplayRelease::class)->highestReleasedVersion($composition);
abort_if($version === null, 404);
return view('public.program', [
'composition' => $composition,
'version' => $version,
'nodes' => app(CompositionStructureReader::class)->tree($version),
]);
}
}
+50 -4
View File
@@ -6,6 +6,7 @@
use App\Domain\Catalog\Composition;
use App\Domain\Catalog\CompositionDisplayRelease;
use App\Domain\Catalog\CompositionStructureReader;
use App\Domain\Catalog\CompositionVersion;
use App\Domain\Catalog\ContentElementVersion;
use App\Domain\Catalog\ReleaseStatus;
use App\Domain\Catalog\StructureNode;
@@ -71,16 +72,24 @@ public function program(User $user, Composition $composition): array
$version = $this->display->highestReleasedVersion($composition);
abort_if($version === null, 404);
$nodes = array_map(
fn (StructureNode $node): array => $this->present($user, $node),
$this->structure->tree($version),
);
$leaves = $this->leaves($nodes);
$open = count(array_filter($leaves, fn (array $leaf): bool => $leaf['view_url'] !== null));
return [
'composition' => $composition,
'title' => filled($composition->display_title) ? $composition->display_title : $composition->designation,
'summary' => $composition->summary,
'kind' => $composition->editorialContentKind?->label
?? ($composition->kind?->label()),
'nodes' => array_map(
fn (StructureNode $node): array => $this->present($user, $node),
$this->structure->tree($version),
),
'learning_goal' => $version->learning_goal,
'duration_minutes' => $version->duration_minutes,
'material_note' => $version->material_note,
'coverage' => $leaves === [] ? 'nicht nutzbar' : ($open === count($leaves) ? 'vollständig' : ($open === 0 ? 'nicht nutzbar' : 'teilweise')),
'nodes' => $nodes,
];
}
@@ -104,6 +113,7 @@ private function present(User $user, StructureNode $node): array
'output_class' => $node->outputClass,
'view_url' => $view,
'download_url' => $download,
'program_url' => $this->programUrl($node),
'children' => array_map(
fn (StructureNode $child): array => $this->present($user, $child),
$node->children,
@@ -111,6 +121,42 @@ private function present(User $user, StructureNode $node): array
];
}
/**
* @param list<array<string, mixed>> $nodes
* @return list<array<string, mixed>>
*/
private function leaves(array $nodes): array
{
$leaves = [];
foreach ($nodes as $node) {
if ($node['children'] === []) {
$leaves[] = $node;
continue;
}
$leaves = [...$leaves, ...$this->leaves($node['children'])];
}
return $leaves;
}
private function programUrl(StructureNode $node): ?string
{
if ($node->compositionId === null || $node->compositionVersionId === null) {
return null;
}
$version = CompositionVersion::query()->find($node->compositionVersionId);
if ($version === null || ! $this->display->isReleased($version)) {
return null;
}
return route('member.program', $node->compositionId);
}
private function viewAction(?string $outputClass): string
{
return in_array($outputClass, ['film', 'audio'], true) ? 'streamen' : 'ansehen';