public/pp-planer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: rename song_group_id to label_id in Vue, add data-testid to MacroIcon, fix Pint style

Browse source
This commit is contained in:
Thorsten Bus 2026-05-04 06:33:04 +02:00
parent 6d83b5f38c
commit 41d4bfe2b7
12 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ProFileController.php
View file

@ -27,7 +27,7 @@ public function importPro(Request $request): JsonResponse
}
try {
$service = new ProImportService();
$service = new ProImportService;
$songs = $service->import($file);
return response()->json([

3
app/Services/ProExportService.php
View file

@ -10,8 +10,7 @@ class ProExportService
{
public function __construct(
private readonly MacroResolutionService $macroResolutionService,
) {
}
) {}
public function generateProFile(Song $song, ?Service $service = null): string
{

3
database/migrations/2026_05_03_100100_create_labels_table.php
View file

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
public function up(): void
{
Schema::create('labels', function (Blueprint $table) {

3
database/migrations/2026_05_03_100200_create_macros_tables.php
View file

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
public function up(): void
{
Schema::create('macros', function (Blueprint $table) {

3
database/migrations/2026_05_03_100300_create_macro_assignments_table.php
View file

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
public function up(): void
{
Schema::create('macro_assignments', function (Blueprint $table) {

3
database/migrations/2026_05_03_100400_create_service_macro_override_tables.php
View file

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
public function up(): void
{
Schema::create('service_macro_overrides', function (Blueprint $table) {

3
database/migrations/2026_05_03_100500_wipe_legacy_song_data.php
View file

@ -4,7 +4,8 @@
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
public function up(): void
{
if (! Schema::hasTable('song_groups')) {

3
database/migrations/2026_05_03_100600_refactor_songs_to_labels.php
View file

@ -4,7 +4,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class () extends Migration {
return new class extends Migration
{
public function up(): void
{
Schema::table('song_slides', function (Blueprint $table) {

7
database/migrations/2026_05_03_100700_migrate_legacy_macro_settings.php
View file

@ -3,7 +3,8 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
return new class () extends Migration {
return new class extends Migration
{
public function up(): void
{
$name = DB::table('settings')->where('key', 'macro_name')->value('value');
@ -66,7 +67,5 @@ public function up(): void
});
}
public function down(): void
{
}
public function down(): void {}
};

1
resources/js/Components/MacroIcon.vue
View file

@ -10,6 +10,7 @@ defineEmits(['click'])
<template>
<button
v-if="count > 0"
data-testid="macro-icon"
class="relative flex items-center justify-center rounded-lg bg-amber-100 px-2 py-1 text-xs font-medium text-amber-700 transition-colors hover:bg-amber-200"
:aria-label="`${count} Makro-Zuweisungen`"
@click="$emit('click')"

4
resources/js/Components/SongEditModal.vue
View file

@ -150,10 +150,10 @@ const arrangements = computed(() => {
name: arr.name,
is_default: arr.is_default,
groups: arr.arrangement_groups.map((ag) => {
const group = songData.value.groups.find((g) => g.id === ag.song_group_id)
const group = songData.value.groups.find((g) => g.id === ag.label_id)
return {
id: ag.song_group_id,
id: ag.label_id,
name: group?.name ?? 'Unbekannt',
color: group?.color ?? '#6b7280',
order: ag.order,

4
resources/js/Pages/Services/Edit.vue
View file

@ -116,9 +116,9 @@ function getArrangements(item) {
name: arr.name,
is_default: arr.is_default,
groups: (arr.arrangement_groups ?? []).map((ag) => {
const group = song.groups?.find((g) => g.id === ag.song_group_id) ?? ag.group ?? {}
const group = song.groups?.find((g) => g.id === ag.label_id) ?? ag.group ?? {}
return {
id: ag.song_group_id ?? group.id,
id: ag.label_id ?? group.id,
name: group.name ?? 'Unbekannt',
color: group.color ?? '#6b7280',
order: ag.order,