Skip to content

Commit 1349021

Browse files
rimi-itkrimi-itk
committed
Files settings
1 parent 7d93a27 commit 1349021

4 files changed

Lines changed: 56 additions & 17 deletions

File tree

‎modules/os2forms_fordelingskomponent_examples/config/install/webform.webform.os2forms_fdk_kp_anmoding.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,9 @@ handlers:
371371
journalpost_message: ""
372372
attachment_element: attachment
373373
formular_type: BehandlingsudgifterRefusionsanmodningFormular_1
374-
filspecifikation: BehandlingsudgifterRefusionsanmodningBilag_1
375-
recipient_authority: "55133018"
374+
files:
375+
filspecifikation: BehandlingsudgifterRefusionsanmodningBilag_1
376+
recipient_authority: "55133018"
376377
xml_template: |
377378
<?xml version="1.0" encoding="UTF-8"?>
378379
<Anmodning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -435,7 +436,9 @@ handlers:
435436
journalpost_message: ""
436437
attachment_element: ""
437438
formular_type: BehandlingsudgifterRefusionsanmodningFormular_1
438-
filspecifikation: BehandlingsudgifterRefusionsanmodningBilag_1
439+
files:
440+
filspecifikation: BehandlingsudgifterRefusionsanmodningBilag_1
441+
recipient_authority: "55133018"
439442
xml_template: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<Anmodning xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\r\n <Header>\r\n <Myndighed>urn:oio:cvr-nr:{{ handler.settings.sender.senderId }}</Myndighed>\r\n <ModtagetDato>{{ submission.completed.value|date(\"Y-m-d\") }}</ModtagetDato>\r\n <KLE>{{ handler.settings.distributionContext.kleEmne }}</KLE>\r\n <AnsoegerOplysninger>\r\n <Ansoeger>\r\n <Fornavn>{{ submission.data.fornavn }}</Fornavn>\r\n <Efternavn>{{ submission.data.efternavn }}</Efternavn>\r\n <Personnummer>urn:oio:cpr:0000000000</Personnummer>\r\n </Ansoeger>\r\n </AnsoegerOplysninger>\r\n <Sagstype>\r\n <AlmindeligtHelbredstillaeg>Medicin</AlmindeligtHelbredstillaeg>\r\n </Sagstype>\r\n <Underskriftsoplysninger>\r\n <Underskrift>Underskrift0</Underskrift>\r\n <Underskriftsdato>{{ submission.completed.value|date(\"Y-m-d\") }}</Underskriftsdato>\r\n </Underskriftsoplysninger>\r\n</Anmodning>\r\n"
440443
xsd_url: "module://os2forms_fordelingskomponent/resources/SP/SF2900_XSD/Anmodning.xsd"
441444
fordelingskomponent_sf2900_invalid_twig:
@@ -458,7 +461,9 @@ handlers:
458461
journalpost_message: ""
459462
attachment_element: ""
460463
formular_type: BehandlingsudgifterRefusionsanmodningFormular_1
461-
filspecifikation: BehandlingsudgifterRefusionsanmodningBilag_1
464+
files:
465+
filspecifikation: BehandlingsudgifterRefusionsanmodningBilag_1
466+
recipient_authority: "55133018"
462467
xml_template: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<Anmodning xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\r\n <Header>\r\n <Myndighed>urn:oio:cvr-nr:{{ handler.settings.sender.senderId</Myndighed>\r\n <ModtagetDato>{{ submission.completed.value|date(\"Y-m-d\") }}</ModtagetDato>\r\n <KLE>{{ handler.settings.distributionContext.kleEmne }}</KLE>\r\n </Header>\r\n <AnsoegerOplysninger>\r\n <Ansoeger>\r\n <Fornavn>{{ submission.data.fornavn }}</Fornavn>\r\n <Efternavn>{{ submission.data.efternavn }}</Efternavn>\r\n <Personnummer>urn:oio:cpr:0000000000</Personnummer>\r\n </Ansoeger>\r\n </AnsoegerOplysninger>\r\n <Sagstype>\r\n <AlmindeligtHelbredstillaeg>Medicin</AlmindeligtHelbredstillaeg>\r\n </Sagstype>\r\n <Underskriftsoplysninger>\r\n <Underskrift>Underskrift0</Underskrift>\r\n <Underskriftsdato>{{ submission.completed.value|date(\"Y-m-d\") }}</Underskriftsdato>\r\n </Underskriftsoplysninger>\r\n</Anmodning>\r\n"
463468
xsd_url: "module://os2forms_fordelingskomponent/resources/SP/SF2900_XSD/Anmodning.xsd"
464469
fordelingskomponent_sf2900_invalid_xml:
@@ -481,7 +486,9 @@ handlers:
481486
journalpost_message: ""
482487
attachment_element: ""
483488
formular_type: BehandlingsudgifterRefusionsanmodningFormular_1
484-
filspecifikation: BehandlingsudgifterRefusionsanmodningBilag_1
489+
files:
490+
filspecifikation: BehandlingsudgifterRefusionsanmodningBilag_1
491+
recipient_authority: "55133018"
485492
xml_template: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<Anmodning xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\r\n <AnsoegerOplysninger>\r\n <Ansoeger>\r\n <Fornavn>{{ submission.data.fornavn }}</Fornavn>\r\n <Efternavn>{{ submission.data.efternavn }}</Efternavn>\r\n <Personnummer>urn:oio:cpr:0000000000</Personnummer>\r\n </Ansoeger>\r\n </AnsoegerOplysninger>\r\n <Sagstype>\r\n <AlmindeligtHelbredstillaeg>Medicin</AlmindeligtHelbredstillaeg>\r\n </Sagstype>\r\n <Underskriftsoplysninger>\r\n <Underskrift>Underskrift0</Underskrift>\r\n <Underskriftsdato>{{ submission.completed.value|date(\"Y-m-d\") }}</Underskriftsdato>\r\n </Underskriftsoplysninger>\r\n</Anmodning>\r\n"
486493
xsd_url: "module://os2forms_fordelingskomponent/resources/SP/SF2900_XSD/Anmodning.xsd"
487494
variants: {}

‎src/Plugin/WebformHandler/WebformHandlerSF2900.php‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Drupal\os2forms_fordelingskomponent\Settings;
1313
use Drupal\os2forms_fordelingskomponent\Settings\DistributionContextSettings;
1414
use Drupal\os2forms_fordelingskomponent\Settings\DistributionObjectSettings;
15+
use Drupal\os2forms_fordelingskomponent\Settings\DistributionObjectSettings\FilesSettings as DistributionObjectFilesSettings;
1516
use Drupal\webform\Plugin\WebformHandlerBase;
1617
use Drupal\webform\Utility\WebformDialogHelper;
1718
use Drupal\webform\WebformSubmissionInterface;
@@ -221,21 +222,26 @@ private function buildConfigurationFormDistributionObject(): array {
221222
DistributionObjectSettings::DISTRIBUTION_TYPE_FORMULAR,
222223
], require: FALSE);
223224

224-
$section[DistributionObjectSettings::FILSPECIFIKATION] = [
225+
$section[DistributionObjectSettings::FILES] = [
226+
'#type' => 'fieldset',
227+
'#title' => $this->t('Files'),
228+
];
229+
230+
$section[DistributionObjectSettings::FILES][DistributionObjectFilesSettings::FILSPECIFIKATION] = [
225231
'#type' => 'textfield',
226232
'#title' => $this->t('Filspecifikation (InfRef)'),
227-
'#default_value' => $settings->filspecifikation,
233+
'#default_value' => $settings->files->filspecifikation,
228234
];
229-
$setStates($section[DistributionObjectSettings::FILSPECIFIKATION], [
235+
$setStates($section[DistributionObjectSettings::FILES][DistributionObjectFilesSettings::FILSPECIFIKATION], [
230236
DistributionObjectSettings::DISTRIBUTION_TYPE_FORMULAR,
231237
], require: FALSE);
232238

233-
$section[DistributionObjectSettings::RECIPIENT_AUTHORITY] = [
239+
$section[DistributionObjectSettings::FILES][DistributionObjectFilesSettings::RECIPIENT_AUTHORITY] = [
234240
'#type' => 'textfield',
235241
'#title' => $this->t('Recipient authority'),
236-
'#default_value' => $settings->recipientAuthority,
242+
'#default_value' => $settings->files->recipientAuthority,
237243
];
238-
$setStates($section[DistributionObjectSettings::RECIPIENT_AUTHORITY], [
244+
$setStates($section[DistributionObjectSettings::FILES][DistributionObjectFilesSettings::RECIPIENT_AUTHORITY], [
239245
DistributionObjectSettings::DISTRIBUTION_TYPE_FORMULAR,
240246
], require: FALSE);
241247

‎src/Settings/DistributionObjectSettings.php‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Drupal\os2forms_fordelingskomponent\Settings;
44

5+
use Drupal\os2forms_fordelingskomponent\Settings\DistributionObjectSettings\FilesSettings;
6+
use Drupal\os2forms_fordelingskomponent\Settings\SenderSettings\SftpSettings;
57
use ItkDev\Serviceplatformen\SF2900\EnumType\ObjektTypeType;
68

79
/**
@@ -12,6 +14,10 @@
1214
final class DistributionObjectSettings extends AbstractSettings {
1315
const string NAME = 'distribution_object';
1416

17+
protected static array $settingsProperties = [
18+
self::FILES => FilesSettings::class,
19+
];
20+
1521
public const string DISTRIBUTION_TYPE = 'distribution_type';
1622
public ?string $distributionType = NULL;
1723

@@ -28,16 +34,19 @@ final class DistributionObjectSettings extends AbstractSettings {
2834
public const string FORMULAR_TYPE = 'formular_type';
2935
public ?string $formularType = '';
3036

31-
public const string FILSPECIFIKATION = 'filspecifikation';
32-
public ?string $filspecifikation = '';
33-
34-
public const string RECIPIENT_AUTHORITY = 'recipient_authority';
35-
public ?string $recipientAuthority = '';
36-
3737
public const string XML_TEMPLATE = 'xml_template';
3838
public ?string $xmlTemplate = NULL;
3939

4040
public const string XSD_URL = 'xsd_url';
4141
public ?string $xsdUrl = NULL;
4242

43+
const string FILES = 'files';
44+
public ?FilesSettings $files = NULL;
45+
46+
public function __construct(array $values, bool $throwExceptionOnMissingProperty = FALSE) {
47+
$this->files = new FilesSettings([]);
48+
parent::__construct($values, $throwExceptionOnMissingProperty);
49+
}
50+
51+
4352
}

‎src/Settings/DistributionObjectSettings/FilesSettings.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
namespace Drupal\os2forms_fordelingskomponent\Settings\DistributionObjectSettings;
4+
5+
use Drupal\os2forms_fordelingskomponent\Settings\AbstractSettings;
6+
7+
class FilesSettings extends AbstractSettings
8+
{
9+
const string NAME = 'files';
10+
11+
public const string FILSPECIFIKATION = 'filspecifikation';
12+
public ?string $filspecifikation = '';
13+
14+
public const string RECIPIENT_AUTHORITY = 'recipient_authority';
15+
public ?string $recipientAuthority = '';
16+
17+
}

0 commit comments

Comments
 (0)