From ffd4ff7b9095ab29955869f2d30783af276990ac Mon Sep 17 00:00:00 2001
From: philipp lang <philipp@aweos.de>
Date: Sun, 11 Apr 2021 17:18:28 +0200
Subject: [PATCH] Add joined_at field
---
app/Member/MemberResource.php | 3 ++-
resources/js/views/member/Edit.vue | 21 ++++++++++++---------
resources/js/views/member/Index.vue | 2 +-
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/app/Member/MemberResource.php b/app/Member/MemberResource.php
index 8a9e9c78..5f526f77 100644
--- a/app/Member/MemberResource.php
+++ b/app/Member/MemberResource.php
@@ -23,7 +23,8 @@ class MemberResource extends JsonResource
'send_newspaper' => $this->send_newspaper,
'birthday' => $this->birthday->format('Y-m-d'),
'birthday_human' => $this->birthday->format('d.m.Y'),
- 'joined_at' => $this->joined_at->format('d.m.Y'),
+ 'joined_at' => $this->joined_at->format('Y-m-d'),
+ 'joined_at_human' => $this->joined_at->format('d.m.Y'),
'id' => $this->id,
'gender_id' => $this->gender_id,
'further_address' => $this->further_address,
diff --git a/resources/js/views/member/Edit.vue b/resources/js/views/member/Edit.vue
index 4e3e440e..4db5bd5e 100644
--- a/resources/js/views/member/Edit.vue
+++ b/resources/js/views/member/Edit.vue
@@ -13,37 +13,37 @@
<div class="flex-grow">
<div class="grid grid-cols-2 gap-3 p-4" v-if="menuTitle == 'Stammdaten'">
<div>
- <f-select id="gender_id" :options="genders" v-model="inner.gender_id" label="Geschlecht" required></f-select>
+ <f-select id="gender_id" :options="genders" v-model="inner.gender_id" label="Geschlecht"></f-select>
</div>
<div>
- <f-text id="firstname" v-model="inner.firstname" label="Vorname"></f-text>
+ <f-text id="firstname" v-model="inner.firstname" label="Vorname" required></f-text>
</div>
<div>
- <f-text id="lastname" v-model="inner.lastname" label="Nachname"></f-text>
+ <f-text id="lastname" v-model="inner.lastname" label="Nachname" required></f-text>
</div>
<div>
- <f-text id="address" v-model="inner.address" label="Adresse"></f-text>
+ <f-text id="address" v-model="inner.address" label="Adresse" required></f-text>
</div>
<div>
<f-text id="further_address" v-model="inner.further_address" label="Adresszusatz"></f-text>
</div>
<div>
- <f-text id="zip" v-model="inner.zip" label="PLZ"></f-text>
+ <f-text id="zip" v-model="inner.zip" label="PLZ" required></f-text>
</div>
<div>
- <f-text id="location" v-model="inner.location" label="Ort"></f-text>
+ <f-text id="location" v-model="inner.location" label="Ort" required></f-text>
</div>
<div>
- <f-text type="date" id="birthday" v-model="inner.birthday" label="Geburtsdatum"></f-text>
+ <f-text type="date" id="birthday" v-model="inner.birthday" label="Geburtsdatum" required></f-text>
</div>
<div>
<f-select :options="regions" id="region_id" v-model="inner.region_id" label="Bundesland"></f-select>
</div>
<div>
- <f-select :options="countries" id="country_id" v-model="inner.country_id" label="Land"></f-select>
+ <f-select :options="countries" id="country_id" v-model="inner.country_id" label="Land" required></f-select>
</div>
<div>
- <f-select :options="nationalities" id="nationality_id" v-model="inner.nationality_id" label="Staatsangehörigkeit"></f-select>
+ <f-select :options="nationalities" id="nationality_id" v-model="inner.nationality_id" label="Staatsangehörigkeit" required></f-select>
</div>
</div>
<div class="grid grid-cols-2 gap-3 p-4" v-if="menuTitle == 'Kontakt'">
@@ -70,6 +70,9 @@
<div>
<f-text id="other_country" v-model="inner.other_country" label="Andere Staatsangehörigkeit"></f-text>
</div>
+ <div>
+ <f-text type="date" id="joined_at" v-model="inner.joined_at" label="Eintrittsdatum"></f-text>
+ </div>
<div>
<f-select :options="confessions" id="confession_id" v-model="inner.confession_id" label="Konfession"></f-select>
</div>
diff --git a/resources/js/views/member/Index.vue b/resources/js/views/member/Index.vue
index 13d18ef9..eb464645 100644
--- a/resources/js/views/member/Index.vue
+++ b/resources/js/views/member/Index.vue
@@ -26,7 +26,7 @@
<v-bool v-model="member.nami_id !== null"></v-bool>
</div>
<div class="py-1 px-6" v-text="`${member.birthday_human}`"></div>
- <div class="py-1 px-6" v-text="`${member.joined_at}`"></div>
+ <div class="py-1 px-6" v-text="`${member.joined_at_human}`"></div>
</inertia-link>
</div>