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

Fix column name
continuous-integration/drone/push Build is passing Details

This commit is contained in:
philipp lang 2025-07-09 23:20:17 +02:00
parent 247a89ae77
commit 6463997f8f
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Form/Requests/FormCompileRequest.php
View File

@ -72,7 +72,7 @@ class FormCompileRequest extends Data implements HasContributionData {
} }
$members[] = [ $members[] = [
'is_leader' => $participant->matchesCondition($participant->form->leader_condition), 'is_leader' => $participant->matchesCondition($participant->form->leader_conditions),
'gender' => 'weiblich', 'gender' => 'weiblich',
...$member, ...$member,
]; ];

7
resources/js/views/form/Index.vue
View File

@ -115,6 +115,11 @@
<conditions id="prevention_conditions" v-model="single.prevention_conditions" :single="single" /> <conditions id="prevention_conditions" v-model="single.prevention_conditions" :single="single" />
</ui-box> </ui-box>
</div> </div>
<div v-if="active === 6">
<ui-box heading="Bedingung für Leiter*in">
<conditions id="leader_conditions" v-model="single.leader_conditions" :single="single" />
</ui-box>
</div>
</div> </div>
<template #actions> <template #actions>
<a href="#" @click.prevent="submit"> <a href="#" @click.prevent="submit">
@ -202,7 +207,7 @@ const fileSettingPopup = ref(null);
const active = ref(0); const active = ref(0);
const activeMailTab = ref(0); const activeMailTab = ref(0);
const tabs = [{ title: 'Allgemeines' }, { title: 'Beschreibung' }, { title: 'Formular' }, { title: 'Bestätigungs-E-Mail' }, { title: 'Export' }, { title: 'Prävention' }]; const tabs = [{ title: 'Allgemeines' }, { title: 'Beschreibung' }, { title: 'Formular' }, { title: 'Bestätigungs-E-Mail' }, { title: 'Export' }, { title: 'Prävention' }, {title: 'Zuschüsse'}];
const mailTabs = [{ title: 'vor Daten' }, { title: 'nach Daten' }]; const mailTabs = [{ title: 'vor Daten' }, { title: 'nach Daten' }];
const swal = useSwal(); const swal = useSwal();

2
tests/Feature/Form/GenerateContributionTest.php
View File

@ -144,7 +144,7 @@ it('creates document with is leader', function (array $defaultData, array $field
test()->dropdownField('leader')->options(['L', 'NL'])->specialType(SpecialType::LEADER), test()->dropdownField('leader')->options(['L', 'NL'])->specialType(SpecialType::LEADER),
]) ])
->has(Participant::factory()->data([...$defaultData, 'leader' => 'L'])) ->has(Participant::factory()->data([...$defaultData, 'leader' => 'L']))
->leaderCondition(ConditionRequestFactory::new()->whenField('leader', 'L')->create()) ->leaderConditions(ConditionRequestFactory::new()->whenField('leader', 'L')->create())
->create(); ->create();
generate(RdpNrwDocument::class, $form, false)->assertOk(); generate(RdpNrwDocument::class, $form, false)->assertOk();