Mache Medien, Übungen und Kurse in der Verwaltung bearbeitbar.
Deploy Test / test (push) Successful in 13s
Deploy Test / deploy (push) Successful in 23s

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
LarsandCursor committed 2026-11-15 10:49:35 +01:00
1 parent 4f2e5a5f3b
commit 3ee9f529ca
33 files changed
+1105 -284

No files matched your search

+2
View File
@@ -9,12 +9,14 @@ class Composition extends Model
{
protected $fillable = [
'designation',
'kind',
'archived_at',
];
protected function casts(): array
{
return [
'kind' => CompositionKind::class,
'archived_at' => 'datetime',
];
}
+60
View File
@@ -0,0 +1,60 @@
<?php
namespace App\Domain\Catalog;
enum CompositionKind: string
{
case Kombination = 'kombination';
case Uebung = 'uebung';
case Kurs = 'kurs';
public function label(): string
{
return match ($this) {
self::Kombination => 'Fachliche Kombination',
self::Uebung => 'Übung',
self::Kurs => 'Kurs',
};
}
public function plural(): string
{
return match ($this) {
self::Kombination => 'Fachliche Kombinationen',
self::Uebung => 'Übungen',
self::Kurs => 'Kurse',
};
}
public function createLabel(): string
{
return match ($this) {
self::Kombination => 'Kombination anlegen',
self::Uebung => 'Übung anlegen',
self::Kurs => 'Kurs anlegen',
};
}
public function explanation(): string
{
return match ($this) {
self::Kombination => 'Didaktische oder thematische Zusammenstellung, zum Beispiel ein Materialsatz. Sie wird in Übungen und Kursen wiederverwendet und ist selbst kein Kurs.',
self::Uebung => 'Eine konkrete Lernsituation, zum Beispiel aus Film und Merkblatt. Dieselben Medien können in mehreren Übungen stecken.',
self::Kurs => 'Ein Ablauf für den Kursbetrieb aus Übungen, Kombinationen und Medien. Ein Kurs ist keine Übung.',
};
}
/**
* @return array<string, string>
*/
public static function options(): array
{
$options = [];
foreach (self::cases() as $case) {
$options[$case->value] = $case->label();
}
return $options;
}
}
+3 -2
View File
@@ -118,10 +118,11 @@ public function publishComposition(
});
}
public function createComposition(string $designation): Composition
public function createComposition(string $designation, CompositionKind $kind = CompositionKind::Uebung): Composition
{
return Composition::query()->create([
'designation' => $this->required($designation, 'Die Bezeichnung der Komposition fehlt.'),
'designation' => $this->required($designation, 'Die Bezeichnung fehlt.'),
'kind' => $kind,
]);
}
@@ -0,0 +1,34 @@
<?php
namespace App\Filament\Resources\Combinations;
use App\Domain\Catalog\CompositionKind;
use App\Filament\Resources\Combinations\Pages\EditCombination;
use App\Filament\Resources\Combinations\Pages\ListCombinations;
use App\Filament\Resources\Compositions\CompositionKindResource;
class CombinationResource extends CompositionKindResource
{
protected static ?string $slug = 'kombinationen';
protected static ?string $navigationLabel = 'Fachliche Kombinationen';
protected static ?string $modelLabel = 'Fachliche Kombination';
protected static ?string $pluralModelLabel = 'Fachliche Kombinationen';
protected static ?int $navigationSort = 2;
public static function kind(): CompositionKind
{
return CompositionKind::Kombination;
}
public static function getPages(): array
{
return [
'index' => ListCombinations::route('/'),
'edit' => EditCombination::route('/{record}'),
];
}
}
@@ -0,0 +1,11 @@
<?php
namespace App\Filament\Resources\Combinations\Pages;
use App\Filament\Resources\Combinations\CombinationResource;
use App\Filament\Resources\Compositions\Pages\EditComposition;
class EditCombination extends EditComposition
{
protected static string $resource = CombinationResource::class;
}
@@ -0,0 +1,17 @@
<?php
namespace App\Filament\Resources\Combinations\Pages;
use App\Domain\Catalog\CompositionKind;
use App\Filament\Resources\Combinations\CombinationResource;
use App\Filament\Resources\Compositions\Pages\ListCompositionKind;
class ListCombinations extends ListCompositionKind
{
protected static string $resource = CombinationResource::class;
protected function kind(): CompositionKind
{
return CompositionKind::Kombination;
}
}
@@ -0,0 +1,53 @@
<?php
namespace App\Filament\Resources\Compositions;
use App\Domain\Catalog\Composition;
use App\Domain\Catalog\CompositionKind;
use App\Filament\Resources\ContentElements\ContentElementResource;
use Filament\Resources\Resource;
use Filament\Schemas\Schema;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Table;
use Illuminate\Auth\Access\Response;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
abstract class CompositionKindResource extends Resource
{
protected static ?string $model = Composition::class;
protected static string|\UnitEnum|null $navigationGroup = 'Inhalte';
protected static ?string $recordTitleAttribute = 'designation';
abstract public static function kind(): CompositionKind;
public static function canViewAny(): bool
{
return ContentElementResource::editor();
}
public static function getEditAuthorizationResponse(Model $record): Response
{
return ContentElementResource::editor() ? Response::allow() : Response::deny();
}
public static function form(Schema $schema): Schema
{
return $schema;
}
public static function table(Table $table): Table
{
return $table->columns([
TextColumn::make('designation')->label('Bezeichnung')->searchable(),
TextColumn::make('versions_count')->counts('versions')->label('Fassungen'),
]);
}
public static function getEloquentQuery(): Builder
{
return parent::getEloquentQuery()->where('kind', static::kind());
}
}
@@ -1,79 +0,0 @@
<?php
namespace App\Filament\Resources\Compositions;
use App\Domain\Catalog\Composition;
use App\Filament\Resources\Compositions\Pages\ListCompositions;
use App\Filament\Resources\Compositions\Pages\ViewComposition;
use App\Filament\Resources\ContentElements\ContentElementResource;
use App\Filament\Support\CatalogReading;
use Filament\Infolists\Components\TextEntry;
use Filament\Resources\Resource;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Schema;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Table;
use Illuminate\Auth\Access\Response;
use Illuminate\Database\Eloquent\Model;
class CompositionResource extends Resource
{
protected static ?string $model = Composition::class;
protected static string|\UnitEnum|null $navigationGroup = 'Inhalte';
protected static ?string $navigationLabel = 'Kurse und Übungen';
protected static ?string $modelLabel = 'Kurs oder Übung';
protected static ?string $pluralModelLabel = 'Kurse und Übungen';
protected static ?string $recordTitleAttribute = 'designation';
protected static ?int $navigationSort = 2;
public static function canViewAny(): bool
{
return ContentElementResource::editor();
}
public static function getViewAuthorizationResponse(Model $record): Response
{
return ContentElementResource::editor() ? Response::allow() : Response::deny();
}
public static function infolist(Schema $schema): Schema
{
return $schema->components([
Section::make('Mitglieder')->description('Geordnete Fassungen, keine Kopie der Dateien.')->schema([
TextEntry::make('members')->hiddenLabel()->listWithLineBreaks()
->state(fn (Composition $record): array => app(CatalogReading::class)->compositionMembers($record)),
]),
Section::make('Verwendung')->schema([
TextEntry::make('usage')->hiddenLabel()->listWithLineBreaks()
->state(fn (Composition $record): array => app(CatalogReading::class)->compositionUsage($record)),
]),
]);
}
public static function form(Schema $schema): Schema
{
return $schema;
}
public static function table(Table $table): Table
{
return $table->columns([
TextColumn::make('designation')->label('Bezeichnung')->searchable(),
TextColumn::make('versions_count')->counts('versions')->label('Fassungen'),
]);
}
public static function getPages(): array
{
return [
'index' => ListCompositions::route('/'),
'view' => ViewComposition::route('/{record}'),
];
}
}
@@ -0,0 +1,214 @@
<?php
namespace App\Filament\Resources\Compositions\Pages;
use App\Domain\Catalog\Composition;
use App\Domain\Catalog\CompositionKind;
use App\Domain\Catalog\CompositionVersion;
use App\Domain\Catalog\ContentElementVersion;
use App\Domain\Catalog\ContentService;
use App\Domain\Catalog\ContentVersionStatus;
use App\Domain\Catalog\DomainRuleException;
use App\Filament\Resources\Combinations\CombinationResource;
use App\Filament\Resources\Courses\CourseResource;
use App\Filament\Resources\Exercises\ExerciseResource;
use App\Filament\Support\CatalogOptions;
use App\Filament\Support\CatalogReading;
use App\Models\User;
use Filament\Actions\Action;
use Filament\Facades\Filament;
use Filament\Forms\Components\Placeholder;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Notifications\Notification;
use Filament\Resources\Pages\EditRecord;
use Filament\Schemas\Schema;
use Filament\Support\Exceptions\Halt;
use Illuminate\Contracts\Support\Htmlable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\HtmlString;
abstract class EditComposition extends EditRecord
{
protected ?string $savedTitle = null;
public function getSubheading(): string|Htmlable|null
{
return 'Bausteine hinzufügen, gegen eine neuere Medienfassung tauschen oder aus der Liste nehmen. Speichern legt dafür eine neue Fassung an. Die bisherige Fassung bleibt und wird nicht nachträglich verändert.';
}
public function form(Schema $schema): Schema
{
return $schema->columns(1)->components([
TextInput::make('designation')->label('Bezeichnung')->required(),
Select::make('kind')->label('Art')->options(CompositionKind::options())->required()
->helperText('Übung, Kurs und fachliche Kombination sind verschiedene Zusammenstellungen. Die Art lässt sich hier ändern.'),
Placeholder::make('history')->label('Aktuelle Fassung')->content(function (): HtmlString {
/** @var Composition $composition */
$composition = $this->getRecord();
$lines = app(CatalogReading::class)->compositionMembers($composition);
return new HtmlString(collect($lines)->map(fn (string $line): string => e($line))->implode('<br>'));
}),
Repeater::make('members')
->label('Bausteine der neuen Fassung')
->schema([
TextInput::make('role')->label('Rolle')->placeholder('Film, Merkblatt, Übung')->required(),
Select::make('target')->label('Fassung')->required()->searchable()
->options(fn (): array => CatalogOptions::assignmentTargets($this->getRecord()->getKey())),
])
->minItems(1)
->reorderable()
->addActionLabel('Baustein hinzufügen')
->helperText('Eine Zeile entfernen nimmt den Baustein nur aus der neuen Fassung. Eine neuere Medienfassung gilt erst, wenn du sie hier auswählst.'),
TextInput::make('note')->label('Notiz zur neuen Fassung'),
]);
}
protected function getSaveFormAction(): Action
{
return parent::getSaveFormAction()->label('Neue Fassung veröffentlichen');
}
protected function getSavedNotificationTitle(): ?string
{
return $this->savedTitle ?? 'Die neue Fassung ist veröffentlicht.';
}
/**
* @param array<string, mixed> $data
* @return array<string, mixed>
*/
protected function mutateFormDataBeforeFill(array $data): array
{
/** @var Composition $composition */
$composition = $this->getRecord();
$version = $composition->versions()
->where('status', ContentVersionStatus::Bereit)
->orderByDesc('number')
->with('members')
->first();
$members = [];
foreach ($version?->members ?? [] as $member) {
$target = $member->content_element_version_id
? 'element:'.$member->content_element_version_id
: 'composition:'.$member->nested_composition_version_id;
$members[] = ['role' => $member->role, 'target' => $target];
}
$kind = $composition->kind;
return [
'designation' => $composition->designation,
'kind' => $kind instanceof CompositionKind ? $kind->value : $kind,
'members' => $members,
'note' => null,
];
}
/**
* @param array<string, mixed> $data
*/
protected function handleRecordUpdate(Model $record, array $data): Model
{
/** @var Composition $record */
try {
$kind = CompositionKind::from($data['kind']);
$record->designation = trim((string) $data['designation']);
$record->kind = $kind;
$record->save();
$members = [];
foreach ($data['members'] as $member) {
if (! is_string($member['target'] ?? null) || ! str_contains($member['target'], ':')) {
throw new DomainRuleException('Jeder Baustein braucht eine Fassung.');
}
[$type, $id] = explode(':', $member['target'], 2);
$target = $type === 'composition'
? CompositionVersion::query()->findOrFail($id)
: ContentElementVersion::query()->findOrFail($id);
$members[] = ['role' => $member['role'], 'target' => $target];
}
$note = is_string($data['note'] ?? null) ? trim($data['note']) : '';
if ($note !== '' || ! $this->sameMembers($record, $members)) {
$actor = Filament::auth()->user();
app(ContentService::class)->publishComposition(
$record,
$members,
$actor instanceof User ? $actor : null,
$note !== '' ? $note : null,
);
$this->savedTitle = 'Die neue Fassung ist veröffentlicht. Die bisherige Fassung bleibt erhalten.';
} else {
$this->savedTitle = 'Bezeichnung und Art sind gespeichert. Die Bausteine sind unverändert, deshalb gibt es keine neue Fassung.';
}
} catch (DomainRuleException $exception) {
Notification::make()->title($exception->getMessage())->danger()->send();
throw new Halt;
}
return $record;
}
protected function afterSave(): void
{
$this->getRecord()->unsetRelations();
$this->getRecord()->refresh();
$this->fillForm();
}
protected function getRedirectUrl(): ?string
{
/** @var Composition $record */
$record = $this->getRecord();
$kind = $record->kind instanceof CompositionKind ? $record->kind : CompositionKind::from((string) $record->kind);
$resource = match ($kind) {
CompositionKind::Kurs => CourseResource::class,
CompositionKind::Kombination => CombinationResource::class,
CompositionKind::Uebung => ExerciseResource::class,
};
if ($resource !== static::getResource()) {
return $resource::getUrl('edit', ['record' => $record]);
}
return null;
}
/**
* @param list<array{role: string, target: ContentElementVersion|CompositionVersion}> $members
*/
private function sameMembers(Composition $composition, array $members): bool
{
$version = $composition->versions()
->where('status', ContentVersionStatus::Bereit)
->orderByDesc('number')
->with('members')
->first();
if ($version === null) {
return false;
}
$current = $version->members->map(function ($member): string {
$target = $member->content_element_version_id
? 'element:'.$member->content_element_version_id
: 'composition:'.$member->nested_composition_version_id;
return $member->role.'|'.$target;
})->all();
$next = array_values(array_map(
fn (array $member): string => $member['role'].'|'.($member['target'] instanceof ContentElementVersion ? 'element:' : 'composition:').$member['target']->id,
$members,
));
return $current === $next;
}
}
@@ -2,8 +2,8 @@
namespace App\Filament\Resources\Compositions\Pages;
use App\Domain\Catalog\CompositionKind;
use App\Domain\Catalog\ContentService;
use App\Filament\Resources\Compositions\CompositionResource;
use App\Filament\Resources\ContentElements\ContentElementResource;
use App\Filament\Support\ReportsDomainRules;
use Filament\Actions\Action;
@@ -11,30 +11,35 @@
use Filament\Resources\Pages\ListRecords;
use Illuminate\Contracts\Support\Htmlable;
class ListCompositions extends ListRecords
abstract class ListCompositionKind extends ListRecords
{
use ReportsDomainRules;
protected static string $resource = CompositionResource::class;
abstract protected function kind(): CompositionKind;
public function getSubheading(): string|Htmlable|null
{
return 'Hier entsteht der Kurs: fertige Fassungen in einer Reihenfolge, zum Beispiel Film und Merkblatt. Dieselbe Fassung kann in weiteren Kursen stecken. Verkauf und Rechte entstehen am Lizenzartikel, am Paket und am Angebot.';
return $this->kind()->explanation();
}
protected function getHeaderActions(): array
{
return [
Action::make('create')
->label('Kurs anlegen')
->label($this->kind()->createLabel())
->visible(fn (): bool => ContentElementResource::editor())
->schema([
TextInput::make('designation')->label('Bezeichnung')->required(),
])
->action(function (array $data): void {
$this->report(function () use ($data): void {
app(ContentService::class)->createComposition($data['designation']);
}, 'Der Kurs ist angelegt.');
$composition = null;
$this->report(function () use ($data, &$composition): void {
$composition = app(ContentService::class)->createComposition($data['designation'], $this->kind());
}, $this->kind()->label().' ist angelegt.');
if ($composition !== null) {
$this->redirect(static::getResource()::getUrl('edit', ['record' => $composition]));
}
}),
];
}
@@ -1,62 +0,0 @@
<?php
namespace App\Filament\Resources\Compositions\Pages;
use App\Domain\Catalog\Composition;
use App\Domain\Catalog\CompositionVersion;
use App\Domain\Catalog\ContentElementVersion;
use App\Domain\Catalog\ContentService;
use App\Filament\Resources\Compositions\CompositionResource;
use App\Filament\Support\CatalogOptions;
use App\Filament\Support\ReportsDomainRules;
use Filament\Actions\Action;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Resources\Pages\ViewRecord;
class ViewComposition extends ViewRecord
{
use ReportsDomainRules;
protected static string $resource = CompositionResource::class;
protected function getHeaderActions(): array
{
return [
Action::make('publish')
->label('Fassung veröffentlichen')
->schema([
Repeater::make('members')->label('Bausteine')->schema([
TextInput::make('role')->label('Rolle im Kurs')->placeholder('Film, Merkblatt, Übung')->required(),
Select::make('target')->label('Bereitgestellte Fassung')->options(fn (): array => CatalogOptions::readyTargets())->required(),
])->minItems(1)->helperText('Nur bereitgestellte Fassungen. Eine Datei, die noch übernommen wird, erscheint hier noch nicht.'),
TextInput::make('note')->label('Bestätigungsnotiz'),
])
->action(function (array $data): void {
$this->report(function () use ($data): void {
/** @var Composition $composition */
$composition = $this->getRecord();
$members = [];
foreach ($data['members'] as $member) {
[$type, $id] = explode(':', $member['target'], 2);
$target = $type === 'composition'
? CompositionVersion::query()->findOrFail($id)
: ContentElementVersion::query()->findOrFail($id);
$members[] = ['role' => $member['role'], 'target' => $target];
}
app(ContentService::class)->publishComposition(
$composition,
$members,
auth()->user(),
$data['note'] ?? null,
);
}, 'Die Kompositionsfassung ist bestätigt und bereit.');
$this->getRecord()->unsetRelations();
$this->getRecord()->refresh();
}),
];
}
}
@@ -4,18 +4,16 @@
use App\Domain\Catalog\ContentElement;
use App\Domain\Identity\StaffRole;
use App\Filament\Resources\ContentElements\Pages\EditContentElement;
use App\Filament\Resources\ContentElements\Pages\ListContentElements;
use App\Filament\Resources\ContentElements\Pages\ViewContentElement;
use App\Filament\Support\CatalogReading;
use App\Models\User;
use Filament\Facades\Filament;
use Filament\Infolists\Components\TextEntry;
use Filament\Resources\Resource;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Schema;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Table;
use Illuminate\Auth\Access\Response;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
class ContentElementResource extends Resource
@@ -24,11 +22,11 @@ class ContentElementResource extends Resource
protected static string|\UnitEnum|null $navigationGroup = 'Inhalte';
protected static ?string $navigationLabel = 'Inhaltselemente';
protected static ?string $navigationLabel = 'Medien';
protected static ?string $modelLabel = 'Inhaltselement';
protected static ?string $modelLabel = 'Medium';
protected static ?string $pluralModelLabel = 'Inhaltselemente';
protected static ?string $pluralModelLabel = 'Medien';
protected static ?string $recordTitleAttribute = 'working_title';
@@ -46,25 +44,11 @@ public static function editor(): bool
return $user instanceof User && $user->hasStaffRole(StaffRole::Redakteur);
}
public static function getViewAuthorizationResponse(Model $record): Response
public static function getEditAuthorizationResponse(Model $record): Response
{
return self::editor() ? Response::allow() : Response::deny();
}
public static function infolist(Schema $schema): Schema
{
return $schema->components([
Section::make('Fassungen')->schema([
TextEntry::make('versions')->hiddenLabel()->listWithLineBreaks()
->state(fn (ContentElement $record): array => app(CatalogReading::class)->elementVersions($record)),
]),
Section::make('Verwendung')->description('Kompositionen und Lizenzartikel, die auf dieses Material zeigen.')->schema([
TextEntry::make('usage')->hiddenLabel()->listWithLineBreaks()
->state(fn (ContentElement $record): array => app(CatalogReading::class)->elementUsage($record)),
]),
]);
}
public static function form(Schema $schema): Schema
{
return $schema;
@@ -75,16 +59,30 @@ public static function table(Table $table): Table
return $table->columns([
TextColumn::make('working_title')->label('Arbeitstitel')->searchable(),
TextColumn::make('kind')->label('Art'),
TextColumn::make('output_class')->label('Ausgabeklasse'),
TextColumn::make('versions_count')->counts('versions')->label('Fassungen'),
TextColumn::make('stand')->label('Aktuelle Fassung')->state(function (ContentElement $record): string {
$version = $record->versions->sortByDesc('number')->first();
if ($version === null) {
return 'noch keine Fassung';
}
$file = is_array($version->metadata) ? ($version->metadata['file'] ?? null) : null;
return 'Fassung '.$version->number.(is_string($file) && $file !== '' ? ' · mit Datei' : ' · ohne Datei');
}),
]);
}
public static function getEloquentQuery(): Builder
{
return parent::getEloquentQuery()->with('versions');
}
public static function getPages(): array
{
return [
'index' => ListContentElements::route('/'),
'view' => ViewContentElement::route('/{record}'),
'edit' => EditContentElement::route('/{record}'),
];
}
}
@@ -0,0 +1,234 @@
<?php
namespace App\Filament\Resources\ContentElements\Pages;
use App\Domain\Catalog\ContentElement;
use App\Domain\Catalog\ContentElementVersion;
use App\Domain\Catalog\ContentService;
use App\Domain\Catalog\ContentVersionStatus;
use App\Domain\Catalog\DomainRuleException;
use App\Filament\Resources\ContentElements\ContentElementResource;
use App\Filament\Support\CatalogReading;
use App\Filament\Support\IncomingFile;
use App\Filament\Support\ReportsDomainRules;
use Filament\Actions\Action;
use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\Placeholder;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Notifications\Notification;
use Filament\Resources\Pages\EditRecord;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Schema;
use Filament\Support\Exceptions\Halt;
use Illuminate\Contracts\Support\Htmlable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\HtmlString;
class EditContentElement extends EditRecord
{
use ReportsDomainRules;
protected static string $resource = ContentElementResource::class;
protected ?string $savedTitle = null;
public function getSubheading(): string|Htmlable|null
{
return 'Speichern legt eine neue Fassung an. Die bisherige Fassung bleibt erhalten und kann weiter angesehen werden. Ohne neue Datei bleibt die vorhandene Datei der neuen Fassung zugeordnet.';
}
public function form(Schema $schema): Schema
{
return $schema->columns(1)->components([
TextInput::make('working_title')->label('Arbeitstitel')->required(),
Placeholder::make('history')->label('Bisherige Fassungen')->content(function (): HtmlString {
/** @var ContentElement $element */
$element = $this->getRecord();
$lines = app(CatalogReading::class)->elementVersions($element);
$html = collect($lines)->map(fn (string $line): string => e($line))->implode('<br>');
$links = $element->versions()->orderByDesc('number')->get()->map(function (ContentElementVersion $version): string {
return '<a href="'.e(route('content.preview', $version)).'" target="_blank" rel="noopener">Fassung '.$version->number.' ansehen</a>';
})->implode(' · ');
return new HtmlString($html.($links !== '' ? '<br>'.$links : ''));
}),
Placeholder::make('usage')->label('Verwendung')->content(function (): HtmlString {
/** @var ContentElement $element */
$element = $this->getRecord();
$lines = app(CatalogReading::class)->elementUsage($element);
return new HtmlString(collect($lines)->map(fn (string $line): string => e($line))->implode('<br>'));
}),
Section::make('Neue Fassung')->schema([
Textarea::make('body')->label('Text')->rows(8),
self::uploadField(),
Toggle::make('drop_file')
->label('Datei in der neuen Fassung nicht mehr verwenden')
->visible(fn (): bool => is_string($this->latest()?->metadata['file'] ?? null)),
TextInput::make('decision_seconds')->label('Entscheidungsmarke in Sekunden')->numeric()->minValue(0),
TextInput::make('change_note')->label('Änderungsnotiz'),
]),
]);
}
public static function uploadField(): FileUpload
{
return FileUpload::make('incoming')
->label('Datei')
->disk('cms_incoming')
->directory('inhalte')
->visibility('private')
->maxSize(64 * 1024)
->helperText('Film, Audio, Bild oder PDF bis 64 MB.');
}
protected function getHeaderActions(): array
{
return [
Action::make('preview')
->label('Aktuelle Fassung ansehen')
->url(fn (): ?string => ($version = $this->latest()) === null ? null : route('content.preview', $version))
->visible(fn (): bool => $this->latest() !== null)
->openUrlInNewTab(),
Action::make('block')
->label('Fassung sperren')
->visible(fn (): bool => $this->getRecord()->versions()->where('status', ContentVersionStatus::Bereit)->exists())
->schema([
Select::make('version')->label('Fassung')->options(function (): array {
return $this->getRecord()->versions()
->where('status', ContentVersionStatus::Bereit)
->orderByDesc('number')
->pluck('number', 'id')
->map(fn ($number): string => 'Fassung '.$number)
->all();
})->required(),
Textarea::make('reason')->label('Begründung')->required(),
])
->action(function (array $data): void {
$this->report(function () use ($data): void {
$version = ContentElementVersion::query()->findOrFail($data['version']);
app(ContentService::class)->block($version, $data['reason']);
}, 'Die Fassung ist gesperrt.');
$this->getRecord()->unsetRelation('versions');
$this->fillForm();
}),
Action::make('delete')
->label('Löschen')
->color('danger')
->requiresConfirmation()
->visible(fn (): bool => $this->getRecord()->versions()->doesntExist())
->action(function (): void {
$this->getRecord()->delete();
$this->redirect(ContentElementResource::getUrl('index'));
}),
];
}
protected function getSaveFormAction(): Action
{
return parent::getSaveFormAction()->label('Neue Fassung anlegen');
}
protected function getSavedNotificationTitle(): ?string
{
return $this->savedTitle ?? 'Die neue Fassung ist angelegt.';
}
/**
* @param array<string, mixed> $data
* @return array<string, mixed>
*/
protected function mutateFormDataBeforeFill(array $data): array
{
$latest = $this->latest();
$metadata = is_array($latest?->metadata) ? $latest->metadata : [];
return [
'working_title' => $this->getRecord()->working_title,
'body' => $latest?->body,
'decision_seconds' => $metadata['decision_seconds'] ?? null,
'drop_file' => false,
'change_note' => null,
];
}
/**
* @param array<string, mixed> $data
*/
protected function handleRecordUpdate(Model $record, array $data): Model
{
/** @var ContentElement $record */
try {
$record->working_title = trim((string) $data['working_title']);
$record->save();
$latest = $record->versions()->orderByDesc('number')->first();
$metadata = [];
$incoming = IncomingFile::store($data['incoming'] ?? null);
$dropFile = (bool) ($data['drop_file'] ?? false);
$previousFile = is_array($latest?->metadata) ? ($latest->metadata['file'] ?? null) : null;
if (is_string($incoming) && $incoming !== '') {
$metadata['incoming'] = $incoming;
} elseif (! $dropFile && is_string($previousFile) && $previousFile !== '') {
$metadata['file'] = $previousFile;
}
$decision = is_numeric($data['decision_seconds'] ?? null) ? (int) $data['decision_seconds'] : null;
if ($decision !== null) {
$metadata['decision_seconds'] = $decision;
}
$body = is_string($data['body'] ?? null) ? $data['body'] : null;
$note = is_string($data['change_note'] ?? null) ? $data['change_note'] : null;
$previousDecision = is_array($latest?->metadata) && is_numeric($latest->metadata['decision_seconds'] ?? null)
? (int) $latest->metadata['decision_seconds']
: null;
$changed = $incoming !== null
|| $dropFile
|| trim((string) $body) !== trim((string) $latest?->body)
|| $decision !== $previousDecision
|| (is_string($note) && trim($note) !== '');
if (! $changed) {
$this->savedTitle = 'Der Arbeitstitel ist geändert. Text und Datei sind gleich geblieben, deshalb gibt es keine neue Fassung.';
return $record;
}
if (trim((string) $body) === '' && $metadata === []) {
throw new DomainRuleException('Eine neue Fassung braucht einen Text oder eine Datei.');
}
app(ContentService::class)->publishElementVersion($record, $body, $metadata, $note);
$this->savedTitle = $incoming !== null
? 'Die neue Fassung ist angelegt. Die Datei wird übernommen; die bisherige Fassung bleibt.'
: 'Die neue Fassung ist angelegt. Die bisherige Fassung bleibt erhalten.';
} catch (DomainRuleException $exception) {
Notification::make()->title($exception->getMessage())->danger()->send();
throw new Halt;
}
return $record;
}
protected function afterSave(): void
{
$this->getRecord()->unsetRelation('versions');
$this->getRecord()->refresh();
$this->fillForm();
}
private function latest(): ?ContentElementVersion
{
/** @var ContentElement $element */
$element = $this->getRecord();
return $element->versions()->orderByDesc('number')->first();
}
}
@@ -4,9 +4,11 @@
use App\Domain\Catalog\ContentService;
use App\Filament\Resources\ContentElements\ContentElementResource;
use App\Filament\Support\IncomingFile;
use App\Filament\Support\ReportsDomainRules;
use Filament\Actions\Action;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Resources\Pages\ListRecords;
use Illuminate\Contracts\Support\Htmlable;
@@ -19,14 +21,14 @@ class ListContentElements extends ListRecords
public function getSubheading(): string|Htmlable|null
{
return 'Das Material selbst: Film, Text, PDF. Unter Kurse und Übungen werden daraus Abläufe, unter Pakete verkaufbare Zusammenstellungen.';
return 'Die Dateien und Texte. Eine Übung, ein Kurs oder eine fachliche Kombination verweist darauf; die Datei wird nicht für jede Verwendung neu hochgeladen.';
}
protected function getHeaderActions(): array
{
return [
Action::make('create')
->label('Element anlegen')
->label('Medium anlegen')
->visible(fn (): bool => ContentElementResource::editor())
->schema([
TextInput::make('working_title')->label('Arbeitstitel')->required(),
@@ -45,11 +47,37 @@ protected function getHeaderActions(): array
'pdf' => 'PDF',
'text' => 'Text',
])->required(),
Textarea::make('body')->label('Text'),
EditContentElement::uploadField(),
TextInput::make('decision_seconds')->label('Entscheidungsmarke in Sekunden')->numeric()->minValue(0),
TextInput::make('change_note')->label('Änderungsnotiz'),
])
->action(function (array $data): void {
$this->report(function () use ($data): void {
app(ContentService::class)->createElement($data['kind'], $data['output_class'], $data['working_title']);
}, 'Das Inhaltselement ist angelegt.');
$element = null;
$this->report(function () use ($data, &$element): void {
$service = app(ContentService::class);
$element = $service->createElement($data['kind'], $data['output_class'], $data['working_title']);
$metadata = [];
$incoming = IncomingFile::store($data['incoming'] ?? null);
if (is_string($incoming) && $incoming !== '') {
$metadata['incoming'] = $incoming;
}
if (is_numeric($data['decision_seconds'] ?? null)) {
$metadata['decision_seconds'] = (int) $data['decision_seconds'];
}
$body = $data['body'] ?? null;
if ((is_string($body) && $body !== '') || $metadata !== []) {
$service->publishElementVersion($element, is_string($body) ? $body : null, $metadata, $data['change_note'] ?? null);
}
}, 'Das Medium ist angelegt.');
if ($element !== null) {
$this->redirect(ContentElementResource::getUrl('edit', ['record' => $element]));
}
}),
];
}
@@ -1,95 +0,0 @@
<?php
namespace App\Filament\Resources\ContentElements\Pages;
use App\Domain\Catalog\ContentElement;
use App\Domain\Catalog\ContentElementVersion;
use App\Domain\Catalog\ContentService;
use App\Filament\Resources\ContentElements\ContentElementResource;
use App\Filament\Support\ReportsDomainRules;
use Filament\Actions\Action;
use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Resources\Pages\ViewRecord;
use Illuminate\Contracts\Support\Htmlable;
class ViewContentElement extends ViewRecord
{
use ReportsDomainRules;
protected static string $resource = ContentElementResource::class;
public function getSubheading(): string|Htmlable|null
{
return 'Text und Datei gehören zur Fassung. Eine Filmfassung kann eine Entscheidungsmarke in Sekunden tragen. Zum Kurs wird das Element in einer Komposition, zum Paket über den Lizenzartikel.';
}
protected function getHeaderActions(): array
{
return [
Action::make('preview')
->label('Ansehen')
->url(function (): ?string {
$version = $this->latestVersion();
return $version === null ? null : route('content.preview', $version);
})
->visible(fn (): bool => $this->latestVersion() !== null)
->openUrlInNewTab(),
Action::make('version')
->label('Fassung veröffentlichen')
->schema([
Textarea::make('body')->label('Text'),
FileUpload::make('incoming')
->label('Datei')
->disk('cms_incoming')
->directory('inhalte')
->helperText('Film, Audio oder PDF. Die Datei wird übernommen und ist danach unter Ansehen sichtbar.'),
TextInput::make('decision_seconds')
->label('Entscheidungsmarke in Sekunden')
->numeric()
->minValue(0)
->helperText('Nur für Filme: der Kursplayer pausiert an dieser Stelle.'),
TextInput::make('change_note')->label('Änderungsnotiz'),
])
->action(function (array $data): void {
$this->report(function () use ($data): void {
/** @var ContentElement $element */
$element = $this->getRecord();
$metadata = [];
$incoming = $data['incoming'] ?? null;
if (is_array($incoming)) {
$incoming = array_values(array_filter($incoming, 'is_string'))[0] ?? null;
}
if (is_string($incoming) && $incoming !== '') {
$metadata['incoming'] = $incoming;
}
if (is_numeric($data['decision_seconds'] ?? null)) {
$metadata['decision_seconds'] = (int) $data['decision_seconds'];
}
app(ContentService::class)->publishElementVersion(
$element,
$data['body'] ?? null,
$metadata,
$data['change_note'] ?? null,
);
}, 'Die Fassung ist gespeichert.');
$this->getRecord()->unsetRelations();
$this->getRecord()->refresh();
}),
];
}
private function latestVersion(): ?ContentElementVersion
{
/** @var ContentElement $element */
$element = $this->getRecord();
return $element->versions()->orderByDesc('number')->first();
}
}
@@ -0,0 +1,34 @@
<?php
namespace App\Filament\Resources\Courses;
use App\Domain\Catalog\CompositionKind;
use App\Filament\Resources\Compositions\CompositionKindResource;
use App\Filament\Resources\Courses\Pages\EditCourse;
use App\Filament\Resources\Courses\Pages\ListCourses;
class CourseResource extends CompositionKindResource
{
protected static ?string $slug = 'kurse';
protected static ?string $navigationLabel = 'Kurse';
protected static ?string $modelLabel = 'Kurs';
protected static ?string $pluralModelLabel = 'Kurse';
protected static ?int $navigationSort = 4;
public static function kind(): CompositionKind
{
return CompositionKind::Kurs;
}
public static function getPages(): array
{
return [
'index' => ListCourses::route('/'),
'edit' => EditCourse::route('/{record}'),
];
}
}
@@ -0,0 +1,11 @@
<?php
namespace App\Filament\Resources\Courses\Pages;
use App\Filament\Resources\Compositions\Pages\EditComposition;
use App\Filament\Resources\Courses\CourseResource;
class EditCourse extends EditComposition
{
protected static string $resource = CourseResource::class;
}
@@ -0,0 +1,17 @@
<?php
namespace App\Filament\Resources\Courses\Pages;
use App\Domain\Catalog\CompositionKind;
use App\Filament\Resources\Compositions\Pages\ListCompositionKind;
use App\Filament\Resources\Courses\CourseResource;
class ListCourses extends ListCompositionKind
{
protected static string $resource = CourseResource::class;
protected function kind(): CompositionKind
{
return CompositionKind::Kurs;
}
}
@@ -0,0 +1,34 @@
<?php
namespace App\Filament\Resources\Exercises;
use App\Domain\Catalog\CompositionKind;
use App\Filament\Resources\Compositions\CompositionKindResource;
use App\Filament\Resources\Exercises\Pages\EditExercise;
use App\Filament\Resources\Exercises\Pages\ListExercises;
class ExerciseResource extends CompositionKindResource
{
protected static ?string $slug = 'uebungen';
protected static ?string $navigationLabel = 'Übungen';
protected static ?string $modelLabel = 'Übung';
protected static ?string $pluralModelLabel = 'Übungen';
protected static ?int $navigationSort = 3;
public static function kind(): CompositionKind
{
return CompositionKind::Uebung;
}
public static function getPages(): array
{
return [
'index' => ListExercises::route('/'),
'edit' => EditExercise::route('/{record}'),
];
}
}
@@ -0,0 +1,11 @@
<?php
namespace App\Filament\Resources\Exercises\Pages;
use App\Filament\Resources\Compositions\Pages\EditComposition;
use App\Filament\Resources\Exercises\ExerciseResource;
class EditExercise extends EditComposition
{
protected static string $resource = ExerciseResource::class;
}
@@ -0,0 +1,17 @@
<?php
namespace App\Filament\Resources\Exercises\Pages;
use App\Domain\Catalog\CompositionKind;
use App\Filament\Resources\Compositions\Pages\ListCompositionKind;
use App\Filament\Resources\Exercises\ExerciseResource;
class ListExercises extends ListCompositionKind
{
protected static string $resource = ExerciseResource::class;
protected function kind(): CompositionKind
{
return CompositionKind::Uebung;
}
}
+25
View File
@@ -6,6 +6,7 @@
use App\Domain\Catalog\BundleStatus;
use App\Domain\Catalog\BundleVersion;
use App\Domain\Catalog\Composition;
use App\Domain\Catalog\CompositionKind;
use App\Domain\Catalog\CompositionVersion;
use App\Domain\Catalog\ContentElement;
use App\Domain\Catalog\ContentElementVersion;
@@ -24,6 +25,30 @@ public static function elements(): array
return ContentElement::query()->orderBy('working_title')->pluck('working_title', 'id')->all();
}
/**
* @return array<string, string>
*/
public static function assignmentTargets(?int $exceptCompositionId = null): array
{
$options = [];
foreach (ContentElementVersion::query()->where('status', ContentVersionStatus::Bereit)->with('element')->orderBy('id')->get() as $version) {
$options['element:'.$version->id] = 'Medium: '.$version->element->working_title.' · Fassung '.$version->number;
}
foreach (CompositionVersion::query()->where('status', ContentVersionStatus::Bereit)->with('composition')->orderBy('id')->get() as $version) {
if ($exceptCompositionId !== null && (int) $version->composition_id === $exceptCompositionId) {
continue;
}
$kind = $version->composition->kind;
$label = $kind instanceof CompositionKind ? $kind->label() : 'Zusammenstellung';
$options['composition:'.$version->id] = $label.': '.$version->composition->designation.' · Fassung '.$version->number;
}
return $options;
}
/**
* @return array<string, string>
*/
+12 -3
View File
@@ -7,6 +7,7 @@
use App\Domain\Catalog\BundleStatus;
use App\Domain\Catalog\BundleVersion;
use App\Domain\Catalog\Composition;
use App\Domain\Catalog\CompositionKind;
use App\Domain\Catalog\CompositionMember;
use App\Domain\Catalog\ContentElement;
use App\Domain\Catalog\ContentVersionStatus;
@@ -263,7 +264,7 @@ public function elementUsage(ContentElement $element): array
->get();
foreach ($members as $member) {
$lines[] = 'Komposition '.$member->compositionVersion->composition->designation
$lines[] = self::compositionLabel($member->compositionVersion->composition)
.' · Fassung '.$member->compositionVersion->number
.' · Rolle '.$member->role;
}
@@ -310,7 +311,7 @@ public function compositionMembers(Composition $composition): array
}
$nested = $member->nestedCompositionVersion;
$lines[] = $member->role.' — Komposition '.($nested->composition->designation ?? 'fehlt');
$lines[] = $member->role.' — '.($nested === null ? 'fehlt' : self::compositionLabel($nested->composition));
}
return $lines;
@@ -331,7 +332,7 @@ public function compositionUsage(Composition $composition): array
->get();
foreach ($parents as $member) {
$lines[] = 'Komposition '.$member->compositionVersion->composition->designation
$lines[] = self::compositionLabel($member->compositionVersion->composition)
.' · Fassung '.$member->compositionVersion->number
.' · Rolle '.$member->role;
}
@@ -414,6 +415,14 @@ private function purpose(string $purpose): string
};
}
private static function compositionLabel(Composition $composition): string
{
$kind = $composition->kind;
$label = $kind instanceof CompositionKind ? $kind->label() : 'Zusammenstellung';
return $label.': '.$composition->designation;
}
private function status(mixed $status): string
{
return match (StatusValue::of($status)) {
+46
View File
@@ -0,0 +1,46 @@
<?php
namespace App\Filament\Support;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Storage;
use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
class IncomingFile
{
public static function store(mixed $value): ?string
{
if (is_array($value)) {
foreach ($value as $item) {
$stored = self::store($item);
if ($stored !== null) {
return $stored;
}
}
return null;
}
if ($value instanceof TemporaryUploadedFile || $value instanceof UploadedFile) {
$extension = strtolower($value->getClientOriginalExtension());
$stem = preg_replace('/[^A-Za-z0-9_-]+/', '-', pathinfo($value->getClientOriginalName(), PATHINFO_FILENAME)) ?? '';
$stem = trim($stem, '-');
$stem = ($stem !== '' ? $stem : 'datei').'-'.bin2hex(random_bytes(4));
if (preg_match('/^[a-z0-9]{1,8}$/', $extension) !== 1) {
return null;
}
$path = $value->storeAs('inhalte', $stem.'.'.$extension, 'cms_incoming');
return is_string($path) && $path !== '' ? $path : null;
}
if (! is_string($value) || $value === '' || str_contains($value, '..') || ! str_starts_with($value, 'inhalte/')) {
return null;
}
return Storage::disk('cms_incoming')->exists($value) ? $value : null;
}
}
@@ -84,6 +84,7 @@ public function show(Request $request, LicenseArticle $article): View
'release' => $release,
'entries' => $entries,
'title' => app(CourseOutline::class)->title($article),
'kind' => app(CourseOutline::class)->kindLabel($article),
]);
}
+15
View File
@@ -2,6 +2,7 @@
namespace App\Http;
use App\Domain\Catalog\CompositionKind;
use App\Domain\Catalog\LicenseArticle;
class CourseOutline
@@ -24,4 +25,18 @@ public function title(LicenseArticle $article): string
?? $release->classification_note
?? $article->code;
}
public function kindLabel(LicenseArticle $article): ?string
{
$release = $article->currentRelease;
if ($release === null) {
return null;
}
$release->loadMissing('rootCompositionVersion.composition');
$kind = $release->rootCompositionVersion?->composition?->kind;
return $kind instanceof CompositionKind ? $kind->label() : null;
}
}