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

--wip-- [skip ci]

This commit is contained in:
Philipp Lang 2022-03-15 16:56:54 +01:00
parent 288b6b2daf
commit c1de3dc520
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.bash_history Normal file
View File

@ -0,0 +1,17 @@
php artisan migrate:fresh --seed
exit
php artisan migrate:fresh --seed
php artisan migrate:fresh --database=mysqlrtest
php artisan migrate:fresh --database=mysqltest
exit
php artisan migrate:fresh --seed
exit
exit
php artisan migrate:fresh --seed
exit
exit
php artisan tinker
exit
php artisan tinker
v
exit

2
.config/psysh/psysh_history Normal file
View File

@ -0,0 +1,2 @@
\App\User::factory()->create();
\App\User::factory()->create();

1
app/Member/MemberResource.php
View File

@ -61,6 +61,7 @@ class MemberResource extends JsonResource
'first_subactivity_id' => $this->first_subactivity_id, 'first_subactivity_id' => $this->first_subactivity_id,
'age_group_icon' => $this->age_group_icon, 'age_group_icon' => $this->age_group_icon,
'courses' => CourseResource::collection($this->whenLoaded('courses')), 'courses' => CourseResource::collection($this->whenLoaded('courses')),
'efz' => $this->efz,
]; ];
} }
} }

21
resources/js/views/member/VForm.vue
View File

@ -25,6 +25,7 @@
<f-select :options="regions" id="region_id" v-model="inner.region_id" label="Bundesland"></f-select> <f-select :options="regions" id="region_id" v-model="inner.region_id" label="Bundesland"></f-select>
<f-select :options="countries" id="country_id" v-model="inner.country_id" label="Land" required></f-select> <f-select :options="countries" id="country_id" v-model="inner.country_id" label="Land" required></f-select>
<f-select :options="nationalities" id="nationality_id" v-model="inner.nationality_id" label="Staatsangehörigkeit" required></f-select> <f-select :options="nationalities" id="nationality_id" v-model="inner.nationality_id" label="Staatsangehörigkeit" required></f-select>
<f-text class="col-span-2" id="other_country" v-model="inner.other_country" label="Andere Staatsangehörigkeit"></f-text>
<div class="contents"> <div class="contents">
<h2 class="col-span-full font-semibold text-lg text-white">Erste Gruppierung</h2> <h2 class="col-span-full font-semibold text-lg text-white">Erste Gruppierung</h2>
@ -44,14 +45,16 @@
<div class="grid grid-cols-2 gap-3 p-4" v-if="menuTitle == 'System'"> <div class="grid grid-cols-2 gap-3 p-4" v-if="menuTitle == 'System'">
<f-select :options="billKinds" id="bill_kind_id" v-model="inner.bill_kind_id" label="Rechnung versenden über"></f-select> <f-select :options="billKinds" id="bill_kind_id" v-model="inner.bill_kind_id" label="Rechnung versenden über"></f-select>
</div> </div>
<div class="grid grid-cols-4 gap-3 p-4" v-if="menuTitle == 'Sonstiges'"> <div class="grid grid-cols-4 gap-3 p-4" v-if="menuTitle == 'Verwaltung'">
<f-text class="col-span-2" id="other_country" v-model="inner.other_country" label="Andere Staatsangehörigkeit"></f-text>
<f-switch id="has_nami" v-model="inner.has_nami" label="In Nami eintragen"></f-switch> <f-switch id="has_nami" v-model="inner.has_nami" label="In Nami eintragen"></f-switch>
<f-switch id="send_newspaper" v-model="inner.send_newspaper" label="Mittendrin"></f-switch> <f-switch id="send_newspaper" v-model="inner.send_newspaper" label="Mittendrin versenden"></f-switch>
<f-text class="col-span-2" type="date" id="joined_at" v-model="inner.joined_at" label="Eintrittsdatum"></f-text> <f-text class="col-span-2" type="date" id="joined_at" v-model="inner.joined_at" label="Eintrittsdatum"></f-text>
<f-select class="col-span-2" :options="confessions" id="confession_id" v-model="inner.confession_id" label="Konfession"></f-select>
<f-select class="col-span-2" :options="subscriptions" id="subscription_id" v-model="inner.subscription_id" label="Beitrag"></f-select> <f-select class="col-span-2" :options="subscriptions" id="subscription_id" v-model="inner.subscription_id" label="Beitrag"></f-select>
<f-textarea class="col-span-2" rows="4" id="letter_address" v-model="inner.letter_address" label="Brief-Adresse"></f-textarea> <f-textarea class="col-span-2" rows="4" id="letter_address" v-model="inner.letter_address" label="Brief-Adresse"></f-textarea>
<div class="grid grid-cols-[max-content_1fr] col-span-2 gap-1">
<f-switch id="has_efz" v-model="hasEfz" label="Führungszeugnis eingesehen"></f-switch>
<f-text v-if="inner.efz !== null" type="date" id="efz" v-model="inner.efz" label="Führungszeugnis eingesehen am"></f-text>
</div>
</div> </div>
</div> </div>
</form> </form>
@ -67,7 +70,7 @@ export default {
{ id: 'stammdaten', title: 'Stammdaten' }, { id: 'stammdaten', title: 'Stammdaten' },
{ id: 'kontakt', title: 'Kontakt' }, { id: 'kontakt', title: 'Kontakt' },
{ id: 'system', title: 'System' }, { id: 'system', title: 'System' },
{ id: 'sonstiges', title: 'Sonstiges' }, { id: 'verwaltung', title: 'Verwaltung' },
] ]
}; };
}, },
@ -103,6 +106,14 @@ export default {
computed: { computed: {
menuTitle() { menuTitle() {
return this.menu[this.active].title; return this.menu[this.active].title;
},
hasEfz: {
set(v) {
this.inner.efz = v ? '' : null;
},
get() {
return this.inner.efz !== null;
}
} }
}, },