app/Form/Actions/ParticipantAssignAction.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Form\Models\Participant;
-use Lorisleiva\Actions\ActionRequest;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class ParticipantAssignAction
-{
-    use AsAction;
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'member_id' => 'required|exists:members,id',
-        ];
-    }
-
-    public function handle(Participant $participant, ActionRequest $request): void
-    {
-        $participant->update(['member_id' => $request->input('member_id')]);
-    }
-}

app/Form/Actions/RegisterAction.php

@@ -22,11 +22,11 @@ class RegisterAction
         $memberQuery = FieldCollection::fromRequest($form, $input)
             ->withNamiType()
             ->reduce(fn ($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
-        $member = $form->getFields()->withNamiType()->count() && $memberQuery->count() === 1 ? $memberQuery->first() : null;
+        $mglnr = $form->getFields()->withNamiType()->count() && $memberQuery->count() === 1 ? $memberQuery->first()->mitgliedsnr : null;
 
         $participant = $form->participants()->create([
             'data' => $input,
-            'member_id' => $member?->id,
+            'mitgliedsnr' => $mglnr,
         ]);
 
         $form->getFields()->each(fn ($field) => $field->afterRegistration($form, $participant, $input));

app/Form/Fields/NamiField.php

@@ -116,7 +116,7 @@ class NamiField extends Field
             }
 
             $data[$this->key] = [];
-            $form->participants()->create(['data' => $data, 'member_id' => $member?->id, 'parent_id' => $participant->id]);
+            $form->participants()->create(['data' => $data, 'mitgliedsnr' => $memberData['id'], 'parent_id' => $participant->id]);
         }
     }
 

app/Form/Resources/ParticipantResource.php

@@ -27,9 +27,7 @@ class ParticipantResource extends JsonResource
             'created_at' => $this->created_at->format('Y-m-d H:i:s'),
             'created_at_display' => $this->created_at->format('d.m.Y'),
             'children_count' => $this->children_count,
-            'member_id' => $this->member_id,
             'links' => [
-                'assign' => route('participant.assign', ['participant' => $this->getModel()]),
                 'destroy' => route('participant.destroy', ['participant' => $this->getModel()]),
                 'children' => route('form.participant.index', ['form' => $this->form, 'parent' => $this->id])
             ]

database/migrations/2024_07_02_155058_update_member_participants_column.php

@@ -1,46 +0,0 @@
-<?php
-
-use App\Form\Models\Participant;
-use App\Member\Member;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('participants', function (Blueprint $table) {
-            $table->renameColumn('mitgliedsnr', 'member_id')->nullable();
-        });
-
-        Schema::table('participants', function (Blueprint $table) {
-            $table->unsignedBigInteger('member_id')->nullable(true)->change();
-        });
-
-        foreach (Participant::whereNotNull('member_id')->get() as $p) {
-            $p->update(['member_id' => Member::firstWhere('mitgliedsnr', $p->member_id)?->id]);
-        }
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('participants', function (Blueprint $table) {
-            $table->string('member_id')->nullable(true)->change();
-        });
-
-        Schema::table('participants', function (Blueprint $table) {
-            $table->renameColumn('member_id', 'mitgliedsnr');
-        });
-    }
-};

resources/img/svg/warning-triangle.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512" xml:space="preserve"><path d="M501.362 383.95 320.497 51.474c-29.059-48.921-99.896-48.986-128.994 0L10.647 383.95c-29.706 49.989 6.259 113.291 64.482 113.291h361.736c58.174 0 94.203-63.251 64.497-113.291zM256 437.241c-16.538 0-30-13.462-30-30s13.462-30 30-30 30 13.462 30 30-13.462 30-30 30zm30-120c0 16.538-13.462 30-30 30s-30-13.462-30-30v-150c0-16.538 13.462-30 30-30s30 13.462 30 30v150z" fill="currentColor" /></svg>

resources/js/components/form/Multipleselect.vue

@@ -10,14 +10,7 @@
             ></div>
             <div v-show="visible" class="absolute w-[max-content] z-30 max-h-[25rem] overflow-auto shadow-lg bg-gray-600 border border-gray-500 rounded-lg p-2 top-7 space-y-1">
                 <div v-for="(option, index) in parsedOptions" :key="index" class="flex items-center space-x-2">
-                    <f-switch
+                    <f-switch :id="`${id}-${index}`" size="sm" :model-value="modelValue.includes(option.id)" :value="option.id" @update:modelValue="trigger(option, $event)"></f-switch>
-                        :id="`${id}-${index}`"
-                        :name="`${id}-${index}`"
-                        size="sm"
-                        :model-value="modelValue.includes(option.id)"
-                        :value="option.id"
-                        @update:modelValue="trigger(option, $event)"
-                    ></f-switch>
                     <div class="text-sm text-gray-200" v-text="option.name"></div>
                 </div>
             </div>

resources/js/views/form/MemberAssign.vue

@@ -1,46 +0,0 @@
-<template>
-    <div>
-        <div class="mt-4">
-            <f-text id="search_string" v-model="searchString" label="Mitglied finden"></f-text>
-        </div>
-        <div v-if="results !== null" class="mt-5 sm:mt-10 space-y-2">
-            <a v-for="member in results.hits" :key="member.id" href="#" @click.prevent="emit('assign', member.id)">
-                <div class="flex items-center justify-between hover:bg-sky-600/20 transition text-sky-300 px-3 sm:px-6 py-1 sm:py-3 rounded-lg">
-                    <div class="flex space-x-2 items-center">
-                        <div class="w-5 sm:w-16 flex flex-none">
-                            <ui-age-groups icon-class="w-4 h-4 sm:w-6 sm:h-6" class="flex-col sm:flex-row" :member="member"></ui-age-groups>
-                        </div>
-                        <div class="flex items-baseline flex-col md:flex-row">
-                            <span class="text-lg" v-text="member.fullname"></span>
-                            <span class="ml-2 text-xs" v-text="member.group_name"></span>
-                        </div>
-                    </div>
-                </div>
-            </a>
-        </div>
-    </div>
-</template>
-
-<script setup>
-import {computed, ref} from 'vue';
-import useSearch from '../../composables/useSearch.js';
-const emit = defineEmits(['assign']);
-
-const {search} = useSearch();
-
-const realSearchString = ref('');
-const results = ref(null);
-
-const searchString = computed({
-    get: () => realSearchString.value,
-    set: async (v) => {
-        realSearchString.value = v;
-
-        if (!v.length) {
-            results.value = null;
-            return;
-        }
-        results.value = await search(v, [], {limit: 10});
-    },
-});
-</script>

resources/js/views/form/Participants.vue

@@ -1,8 +1,5 @@
 <template>
     <div class="mt-5">
-        <ui-popup v-if="assigning !== null" heading="Mitglied zuweisen" closeable @close="assigning = null">
-            <member-assign @assign="assign"></member-assign>
-        </ui-popup>
         <ui-popup v-if="deleting !== null" heading="Teilnehmer*in löschen?" @close="deleting = null">
             <div>
                 <p class="mt-4">Den*Die Teilnehmer*in löschen?</p>
@@ -61,10 +58,6 @@
             <template v-for="(participant, index) in data" :key="index">
                 <tr>
                     <td v-for="(column, columnindex) in activeColumns" :key="column.id">
-                        <div class="flex items-center space-x-2">
-                            <button v-if="columnindex === 0 && participant.member_id === null" v-tooltip="`kein Mitglied zugewiesen. Per Klick zuweisen`" @click.prevent="assigning = participant">
-                                <ui-sprite src="warning-triangle" class="text-yellow-400 w-5 h-5"></ui-sprite>
-                            </button>
                         <ui-table-toggle-button
                             v-if="columnindex === 0 && groupParticipants"
                             :value="participant"
@@ -74,7 +67,6 @@
                             @toggle="toggle(participant)"
                         ></ui-table-toggle-button>
                         <div v-else v-text="participant[column.display_attribute]"></div>
-                        </div>
                     </td>
                     <td>
                         <a v-tooltip="`Bearbeiten`" href="#" class="ml-2 inline-flex btn btn-warning btn-sm" @click.prevent="edit(participant)"><ui-sprite src="pencil"></ui-sprite></a>
@@ -112,13 +104,10 @@
 import {watch, ref, computed} from 'vue';
 import {useApiIndex} from '../../composables/useApiIndex.js';
 import useTableToggle from '../../composables/useTableToggle.js';
-import MemberAssign from './MemberAssign.vue';
 
 const deleting = ref(null);
 const {isOpen, toggle, childrenOf, clearToggle} = useTableToggle({});
 
-const assigning = ref(null);
-
 const props = defineProps({
     url: {
         type: String,
@@ -148,12 +137,6 @@ const groupParticipants = computed({
     },
 });
 
-async function assign(memberId) {
-    await axios.post(assigning.value.links.assign, {member_id: memberId});
-    reload();
-    assigning.value = null;
-}
-
 var {meta, data, reload, reloadPage, axios, remove, toFilterString, url, updateUrl} = useApiIndex(props.hasNamiField ? props.rootUrl : props.url, 'participant');
 
 const activeColumns = computed(() => meta.value.columns.filter((c) => meta.value.form_meta.active_columns.includes(c.id)));

routes/web.php

@@ -36,7 +36,6 @@ use App\Form\Actions\FormtemplateUpdateAction;
 use App\Form\Actions\FormUpdateAction;
 use App\Form\Actions\FormUpdateMetaAction;
 use App\Form\Actions\IsDirtyAction;
-use App\Form\Actions\ParticipantAssignAction;
 use App\Form\Actions\ParticipantDestroyAction;
 use App\Form\Actions\ParticipantIndexAction;
 use App\Initialize\Actions\InitializeAction;
@@ -171,7 +170,6 @@ Route::group(['middleware' => 'auth:web'], function (): void {
     Route::get('/form/{form}/participants/{parent?}', ParticipantIndexAction::class)->name('form.participant.index');
     Route::post('/form/{form}/is-dirty', IsDirtyAction::class)->name('form.is-dirty');
     Route::delete('/participant/{participant}', ParticipantDestroyAction::class)->name('participant.destroy');
-    Route::post('/participant/{participant}/assign', ParticipantAssignAction::class)->name('participant.assign');
 
     // ------------------------------------ fileshare -----------------------------------
     Route::post('/fileshare', FileshareStoreAction::class)->name('fileshare.store');

tests/Feature/Form/FormRegisterActionTest.php

@@ -394,7 +394,7 @@ class FormRegisterActionTest extends FormTestCase
     public function testItSetsMitgliedsnrForMainMember(): void
     {
         $this->login()->loginNami();
-        $member = $this->createMember(['mitgliedsnr' => '9966', 'email' => 'max@muster.de', 'firstname' => 'Max', 'lastname' => 'Muster']);
+        $this->createMember(['mitgliedsnr' => '9966', 'email' => 'max@muster.de', 'firstname' => 'Max', 'lastname' => 'Muster']);
         $form = Form::factory()->fields([
             $this->textField('email')->namiType(NamiType::EMAIL),
             $this->textField('firstname')->namiType(NamiType::FIRSTNAME),
@@ -403,7 +403,7 @@ class FormRegisterActionTest extends FormTestCase
             ->create();
 
         $this->register($form, ['email' => 'max@muster.de', 'firstname' => 'Max', 'lastname' => 'Muster'])->assertOk();
-        $this->assertEquals($member->id, $form->participants->first()->member_id);
+        $this->assertEquals('9966', $form->participants->first()->mitgliedsnr);
     }
 
     public function testItDoesntSetMitgliedsnrWhenFieldDoesntHaveType(): void
@@ -416,7 +416,7 @@ class FormRegisterActionTest extends FormTestCase
             ->create();
 
         $this->register($form, ['email' => 'max@muster.de'])->assertOk();
-        $this->assertNull($form->participants->first()->member_id);
+        $this->assertNull($form->participants->first()->mitgliedsnr);
     }
 
     public function testItDoesntSyncMembersWhenTwoMembersMatch(): void
@@ -710,14 +710,14 @@ class FormRegisterActionTest extends FormTestCase
     public function testParticipantsHaveRelationToActualMember(): void
     {
         $this->login()->loginNami();
-        $member = $this->createMember(['mitgliedsnr' => '5505']);
+        $this->createMember(['mitgliedsnr' => '5505']);
         $form = Form::factory()->fields([
             $this->namiField('members'),
         ])
             ->create();
 
         $this->register($form, ['members' => [['id' => '5505']]])->assertOk();
-        $this->assertEquals($member->id, $form->participants->get(1)->member_id);
+        $this->assertEquals('5505', $form->participants->get(1)->mitgliedsnr);
     }
 
     public function testItSetsRegionIdAndGroupIdOfParentGroup(): void

tests/Feature/Form/ParticipantAssignActionTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Tests\Feature\Form;
-
-use App\Form\Models\Form;
-use App\Form\Models\Participant;
-use App\Member\Member;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Tests\TestCase;
-
-class ParticipantAssignActionTest extends TestCase
-{
-
-    use DatabaseTransactions;
-
-    public function testItAssignsAParticipantToAMenber(): void
-    {
-        $this->login()->loginNami();
-        $participant = Participant::factory()->for(Form::factory())->create();
-        $member = Member::factory()->defaults()->create();
-
-        $this->postJson(route('participant.assign', ['participant' => $participant]), ['member_id' => $member->id])->assertOk();
-
-        $this->assertEquals($member->id, $participant->fresh()->member_id);
-    }
-}

tests/Feature/Form/ParticipantIndexActionTest.php

@@ -20,7 +20,7 @@ class ParticipantIndexActionTest extends FormTestCase
         $this->login()->loginNami()->withoutExceptionHandling();
         $group = Group::factory()->innerName('Stamm')->create();
         $form = Form::factory()
-            ->has(Participant::factory()->state(['member_id' => 55])->data(['vorname' => 'Max', 'select' => ['A', 'B'], 'stufe' => 'Pfadfinder', 'test1' => '', 'test2' => '', 'test3' => '', 'birthday' => '1991-04-20', 'bezirk' => $group->id]))
+            ->has(Participant::factory()->data(['vorname' => 'Max', 'select' => ['A', 'B'], 'stufe' => 'Pfadfinder', 'test1' => '', 'test2' => '', 'test3' => '', 'birthday' => '1991-04-20', 'bezirk' => $group->id]))
             ->fields([
                 $this->textField('vorname')->name('Vorname'),
                 $this->checkboxesField('select')->options(['A', 'B', 'C']),
@@ -40,14 +40,12 @@ class ParticipantIndexActionTest extends FormTestCase
             ->assertJsonPath('data.0.vorname_display', 'Max')
             ->assertJsonPath('data.0.stufe', 'Pfadfinder')
             ->assertJsonPath('data.0.bezirk', $group->id)
-            ->assertJsonPath('data.0.member_id', 55)
             ->assertJsonPath('data.0.bezirk_display', 'Stamm')
             ->assertJsonPath('data.0.birthday_display', '20.04.1991')
             ->assertJsonPath('data.0.birthday', '1991-04-20')
             ->assertJsonPath('data.0.select', ['A', 'B'])
             ->assertJsonPath('data.0.select_display', 'A, B')
             ->assertJsonPath('data.0.links.destroy', route('participant.destroy', ['participant' => $form->participants->first()]))
-            ->assertJsonPath('data.0.links.assign', route('participant.assign', ['participant' => $form->participants->first()]))
             ->assertJsonPath('meta.columns.0.name', 'Vorname')
             ->assertJsonPath('meta.columns.0.base_type', class_basename(TextField::class))
             ->assertJsonPath('meta.columns.0.id', 'vorname')