app/Member/MemberResource.php

@@ -106,7 +106,6 @@ class MemberResource extends JsonResource
             'comment' => $this->comment,
             'lat' => $this->lat,
             'lon' => $this->lon,
-            'group_name' => $this->group->name,
             'links' => [
                 'membership_index' => route('member.membership.index', ['member' => $this->getModel()]),
                 'payment_index' => route('member.payment.index', ['member' => $this->getModel()]),

resources/js/views/member/ShowView.vue

@@ -34,7 +34,7 @@
             <ui-box class="area-membershipcourse hidden xl:block">
                 <tabs v-model="tabs.membershipcourse">
                     <courses v-show="tabs.membershipcourse.active === 'course'" :value="inner.courses"></courses>
-                    <memberships v-show="tabs.membershipcourse.active === 'membership'" :value="inner.memberships"> </memberships>
+                    <memberships v-show="tabs.membershipcourse.active === 'membership'" :value="inner.memberships"></memberships>
                 </tabs>
             </ui-box>
             <ui-box heading="Ausbildungen" class="area-courses xl:hidden">
@@ -59,11 +59,6 @@
 import {defineAsyncComponent} from 'vue';
 
 export default {
-
-    props: {
-        data: {},
-        meta: {},
-    },
     data: function () {
         return {
             inner: {},
@@ -84,7 +79,7 @@ export default {
                 },
                 membershipcourse: {
                     children: {
-                        membership: 'Mitgliedschaften',
+                        membership: 'Mitgliedshaften',
                         course: 'Ausbildungen',
                     },
                     active: 'membership',
@@ -95,6 +90,11 @@ export default {
 
     methods: {},
 
+    props: {
+        data: {},
+        meta: {},
+    },
+
     components: {
         stamm: defineAsyncComponent(() => import('./boxes/Stamm.vue')),
         kontakt: defineAsyncComponent(() => import('./boxes/Kontakt.vue')),
@@ -122,7 +122,6 @@ export default {
         'payments';
     grid-template-columns: 1fr;
 }
-
 @media screen and (min-width: 1280px) {
     .this-grid {
         grid-template-areas:
@@ -132,47 +131,36 @@ export default {
         grid-template-columns: max-content max-content max-content 1fr;
     }
 }
-
 .area-stamm {
     grid-area: stamm;
 }
-
 .area-kontakt {
     grid-area: kontakt;
 }
-
 .area-praev {
     grid-area: praev;
 }
-
 .area-courses {
     grid-area: courses;
 }
-
 .area-system {
     grid-area: system;
 }
-
 .area-memberships {
     grid-area: memberships;
 }
-
 .area-payments {
     grid-area: payments;
 }
-
 .area-map {
     grid-area: map;
 }
-
 .area-stammkontakt {
     grid-area: stammkontakt;
 }
-
 .area-membershipcourse {
     grid-area: membershipcourse;
 }
-
 .area-praesystem {
     grid-area: praesystem;
 }

resources/js/views/member/Tabs.vue

@@ -4,9 +4,9 @@
             <a
                 v-for="(v, index) in inner.children"
                 href="#"
-                class="font-semibold hover:text-teal-600 transition-all"
-                :class="{'text-teal-800': inner.active !== index, 'text-teal-600': inner.active === index}"
                 @click.prevent="navigate(index)"
+                class="text-teal-800 font-semibold hover:text-teal-600 transition-all"
+                :class="{'text-teal-600': inner.active === index}"
             >
                 <span v-text="v"></span>
             </a>
@@ -19,10 +19,6 @@
 
 <script>
 export default {
-
-    props: {
-        modelValue: {},
-    },
     data: function () {
         return {
             inner: {
@@ -32,8 +28,8 @@ export default {
         };
     },
 
-    created() {
+    props: {
-        this.inner = this.modelValue;
+        modelValue: {},
     },
 
     methods: {
@@ -42,5 +38,9 @@ export default {
             this.$emit('update:modelValue', this.inner);
         },
     },
+
+    created() {
+        this.inner = this.modelValue;
+    },
 };
 </script>

resources/js/views/member/boxes/Stamm.vue

@@ -7,7 +7,6 @@
         <ui-text-display label="Bundesland" :value="inner.region.name"></ui-text-display>
         <ui-text-display label="Nationalität" :value="inner.nationality?.name"></ui-text-display>
         <ui-text-display v-show="inner.other_country" label="Andere Staatsangehörigkeit" :value="inner.other_country"></ui-text-display>
-        <ui-text-display class="col-span-2" label="Stammgruppierung" :value="inner.group_name"></ui-text-display>
     </div>
 </template>
 

tests/Feature/Member/ShowTest.php

@@ -30,7 +30,6 @@ class ShowTest extends TestCase
         $this->withoutExceptionHandling()->login()->loginNami();
         $member = Member::factory()
             ->defaults()
-            ->for(Group::factory()->name('Stamm Beispiel'))
             ->has(Membership::factory()->promise(now())->in('€ LeiterIn', 5, 'Jungpfadfinder', 88)->from('2022-11-19'))
             ->has(Payment::factory()->notPaid()->nr('2019')->subscription('Free', [
                 new Child('uu', 1000),
@@ -79,7 +78,6 @@ class ShowTest extends TestCase
         $this->assertInertiaHas([
             'birthday_human' => '20.04.1991',
             'age' => 14,
-            'group_name' => 'Stamm Beispiel',
             'full_address' => 'Itterstr 3, 42719 Solingen',
             'region' => ['name' => 'NRW'],
             'other_country' => 'other',