silva
/
adrema
2
1
Fork 0
Code Issues 23 Pull Requests 1 Projects 1 Releases 104 Wiki Activity

Add Stammgruppierung to member view
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details

This commit is contained in:
Philipp Lang 2023-11-24 13:43:52 +01:00
parent ebd321d166
commit 6e1f3f3a0a
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Member/MemberResource.php
View File

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

1
resources/js/views/member/boxes/Stamm.vue
View File

@ -7,6 +7,7 @@
<ui-text-display label="Bundesland" :value="inner.region.name"></ui-text-display> <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 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 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> </div>
</template> </template>

2
tests/Feature/Member/ShowTest.php
View File

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