e33418f716
Resolves a batch of bugs and feature requests across songs, services, settings and export: Songs & sections - Every song now carries permanent, empty, locked PREFIX (COPYRIGHT) and POSTFIX (BLANK) sections, deduplicated on import; locked sections cannot be edited or deleted via UI or API. - Song edit modal: explicit Speichern/Schließen with dirty-tracking, editable section headline (combobox + custom values), and a fix for the 419 CSRF errors after CCLI "Importieren & Bearbeiten" (token read fresh per request). - CCLI bookmarklet "Importieren & Bearbeiten" now opens the edit dialog. Service schedule & arrangements - Fixed assigned songs showing no sections (slides loaded for all arrangements, not just the default). - Added "Song entfernen / neu zuordnen" to reassign an assigned song. - Worship-leader arrangement is created/selected lazily when the arrangement dialog opens (only when not user-overridden); the leader is resolved from the "Lobpreis" agenda item, and manual create/clone names are prefixed with the leader name. Navigation - "/" redirects to the next upcoming service's edit page (or the list). - Service titles link to the edit page. Settings - Renamed "Makro-Import"/"Label-Import" menu items; fixed drag-and-drop imports (were downloading the dropped file); added label-import hint; made the panel scrollable. - Nametag now uses a single MacroPicker; added song prefix/postfix label defaults (COPYRIGHT #24B34C / BLANK #000000); new "Export-Dateien" menu to upload prefix/postfix .pro files added to every export. Export - Filenames/playlist names are date-first ("YYYY-MM-DD <Title>"). - Keyvisual slide only for the first content-less item after real content; all other content-less items render as headlines. - New "Vorschau herunterladen" for non-finalized services (filename and import name prefixed "Vorschau" with export timestamp). - Uploaded prefix/postfix .pro files wrap every export. Tests updated to the new behavior; full suite green (569 passed).
58 lines
1.7 KiB
PHP
58 lines
1.7 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers;
|
|
|
|
use App\Models\ExportProFile;
|
|
use Illuminate\Http\JsonResponse;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Support\Facades\Storage;
|
|
use Illuminate\Validation\Rule;
|
|
|
|
class ExportProFileController extends Controller
|
|
{
|
|
public function store(Request $request): JsonResponse
|
|
{
|
|
$request->validate([
|
|
'type' => ['required', Rule::in(['prefix', 'postfix'])],
|
|
'files' => ['required', 'array'],
|
|
'files.*' => ['required', 'file', 'max:10240', 'extensions:pro'],
|
|
]);
|
|
|
|
$type = $request->input('type');
|
|
$created = [];
|
|
|
|
foreach ($request->file('files') as $file) {
|
|
$storedPath = $file->store('export-pro-files/'.$type, 'local');
|
|
$maxOrder = ExportProFile::where('type', $type)->max('order') ?? 0;
|
|
|
|
$record = ExportProFile::create([
|
|
'type' => $type,
|
|
'original_name' => $file->getClientOriginalName(),
|
|
'stored_path' => $storedPath,
|
|
'order' => $maxOrder + 1,
|
|
]);
|
|
|
|
$created[] = [
|
|
'id' => $record->id,
|
|
'original_name' => $record->original_name,
|
|
'order' => $record->order,
|
|
];
|
|
}
|
|
|
|
return response()->json([
|
|
'files' => $created,
|
|
'message' => count($created).' Datei(en) erfolgreich hochgeladen.',
|
|
], 201);
|
|
}
|
|
|
|
public function destroy(ExportProFile $exportProFile): JsonResponse
|
|
{
|
|
Storage::disk('local')->delete($exportProFile->stored_path);
|
|
$exportProFile->delete();
|
|
|
|
return response()->json([
|
|
'message' => 'Datei erfolgreich gelöscht.',
|
|
]);
|
|
}
|
|
}
|