diff --git a/Civi/Funding/IJB/Application/JsonSchema/IJBGrunddatenJsonSchema.php b/Civi/Funding/IJB/Application/JsonSchema/IJBGrunddatenJsonSchema.php index a77ed5dc4..96336d068 100644 --- a/Civi/Funding/IJB/Application/JsonSchema/IJBGrunddatenJsonSchema.php +++ b/Civi/Funding/IJB/Application/JsonSchema/IJBGrunddatenJsonSchema.php @@ -47,6 +47,11 @@ public function __construct( 'maxLength' => 500, '$tag' => JsonSchema::fromArray(['mapToField' => ['fieldName' => 'short_description']]), ]), + 'internerBezeichner' => new JsonSchemaString([ + '$tag' => JsonSchema::fromArray( + ['mapToField' => ['fieldName' => 'funding_application_process_extra.internal_identifier']] + ), + ]), 'zeitraeume' => new JsonSchemaArray( new JsonSchemaObject([ 'beginn' => new JsonSchemaDate([ @@ -109,7 +114,9 @@ public function __construct( $required = array_filter( array_keys($properties), - static fn (string $key) => $key !== 'fahrtstreckeInKm' && $key !== 'programmtageMitHonorar', + static fn (string $key) => $key !== 'fahrtstreckeInKm' + && $key !== 'programmtageMitHonorar' + && $key !== 'internerBezeichner', ); parent::__construct($properties, ['required' => $required]); diff --git a/Civi/Funding/IJB/Application/UiSchema/IJBGrunddatenUiSchema.php b/Civi/Funding/IJB/Application/UiSchema/IJBGrunddatenUiSchema.php index ff332ddaa..ca9ef3c6f 100644 --- a/Civi/Funding/IJB/Application/UiSchema/IJBGrunddatenUiSchema.php +++ b/Civi/Funding/IJB/Application/UiSchema/IJBGrunddatenUiSchema.php @@ -43,6 +43,7 @@ public function __construct(string $scopePrefix, bool $report = FALSE) { 'placeholder' => 'Maximal 500 Zeichen', ] ), + new JsonFormsControl("$scopePrefix/internerBezeichner", 'Interner Bezeichner'), new JsonFormsArray("$scopePrefix/zeitraeume", 'Zeiträume', NULL, [ new JsonFormsControl('#/properties/beginn', 'Beginn'), new JsonFormsControl('#/properties/ende', 'Ende'), diff --git a/Civi/Funding/SammelantragKurs/Application/JsonSchema/KursGrunddatenJsonSchema.php b/Civi/Funding/SammelantragKurs/Application/JsonSchema/KursGrunddatenJsonSchema.php index 39a6addbc..f53bbdecc 100644 --- a/Civi/Funding/SammelantragKurs/Application/JsonSchema/KursGrunddatenJsonSchema.php +++ b/Civi/Funding/SammelantragKurs/Application/JsonSchema/KursGrunddatenJsonSchema.php @@ -46,6 +46,11 @@ public function __construct( 'maxLength' => 500, '$tag' => JsonSchema::fromArray(['mapToField' => ['fieldName' => 'short_description']]), ]), + 'internerBezeichner' => new JsonSchemaString([ + '$tag' => JsonSchema::fromArray( + ['mapToField' => ['fieldName' => 'funding_application_process_extra.internal_identifier']] + ), + ]), 'zeitraeume' => new JsonSchemaArray( new JsonSchemaObject([ 'beginn' => new JsonSchemaDate([ @@ -109,7 +114,12 @@ public function __construct( $teilnehmerProperties['mitFahrtkosten'] = new JsonSchemaInteger(['minimum' => 0], TRUE); } - parent::__construct($properties, ['required' => array_keys($properties)]); + $required = array_filter( + array_keys($properties), + static fn (string $key) => $key !== 'internerBezeichner', + ); + + parent::__construct($properties, ['required' => $required]); } /** diff --git a/Civi/Funding/SammelantragKurs/Application/UiSchema/KursGrunddatenUiSchema.php b/Civi/Funding/SammelantragKurs/Application/UiSchema/KursGrunddatenUiSchema.php index 8345ff3d5..bb0ecc3fd 100644 --- a/Civi/Funding/SammelantragKurs/Application/UiSchema/KursGrunddatenUiSchema.php +++ b/Civi/Funding/SammelantragKurs/Application/UiSchema/KursGrunddatenUiSchema.php @@ -74,6 +74,7 @@ public function __construct(string $scopePrefix, bool $report = FALSE) { 'placeholder' => 'Kurzbeschreibung der Kursinhalte (maximal 500 Zeichen)', ] ), + new JsonFormsControl("$scopePrefix/internerBezeichner", 'Interner Bezeichner'), new JsonFormsArray("$scopePrefix/zeitraeume", 'Zeiträume', NULL, [ new JsonFormsControl('#/properties/beginn', 'Beginn'), new JsonFormsControl('#/properties/ende', 'Ende'), diff --git a/Civi/Funding/SonstigeAktivitaet/Application/JsonSchema/AVK1GrunddatenSchema.php b/Civi/Funding/SonstigeAktivitaet/Application/JsonSchema/AVK1GrunddatenSchema.php index b062f87f3..4bae91040 100644 --- a/Civi/Funding/SonstigeAktivitaet/Application/JsonSchema/AVK1GrunddatenSchema.php +++ b/Civi/Funding/SonstigeAktivitaet/Application/JsonSchema/AVK1GrunddatenSchema.php @@ -38,6 +38,11 @@ public function __construct(\DateTimeInterface $applicationBegin, \DateTimeInter 'maxLength' => 500, '$tag' => JsonSchema::fromArray(['mapToField' => ['fieldName' => 'short_description']]), ]), + 'internerBezeichner' => new JsonSchemaString([ + '$tag' => JsonSchema::fromArray( + ['mapToField' => ['fieldName' => 'funding_application_process_extra.internal_identifier']] + ), + ]), 'zeitraeume' => new JsonSchemaArray( new JsonSchemaObject([ 'beginn' => new JsonSchemaDate([ @@ -71,7 +76,12 @@ public function __construct(\DateTimeInterface $applicationBegin, \DateTimeInter ]), ]; - parent::__construct($properties, ['required' => array_keys($properties)]); + $required = array_filter( + array_keys($properties), + static fn (string $key) => $key !== 'internerBezeichner', + ); + + parent::__construct($properties, ['required' => $required]); } /** diff --git a/Civi/Funding/SonstigeAktivitaet/Application/UISchema/AVK1GrunddatenUiSchema.php b/Civi/Funding/SonstigeAktivitaet/Application/UISchema/AVK1GrunddatenUiSchema.php index e9a4106ba..b5b43f9be 100644 --- a/Civi/Funding/SonstigeAktivitaet/Application/UISchema/AVK1GrunddatenUiSchema.php +++ b/Civi/Funding/SonstigeAktivitaet/Application/UISchema/AVK1GrunddatenUiSchema.php @@ -56,6 +56,10 @@ public function __construct(string $scopePrefix) { 'placeholder' => 'Maximal 500 Zeichen', ] ), + new JsonFormsControl( + "$scopePrefix/internerBezeichner", + 'Interner Bezeichner' + ), new JsonFormsArray( "$scopePrefix/zeitraeume", 'Zeiträume', diff --git a/ang/crmFundingAVK1SonstigeAktivitaet/avk1SonstigeAktivitaetApplicationEditor.template.html b/ang/crmFundingAVK1SonstigeAktivitaet/avk1SonstigeAktivitaetApplicationEditor.template.html index a62367966..a6b3db9aa 100644 --- a/ang/crmFundingAVK1SonstigeAktivitaet/avk1SonstigeAktivitaetApplicationEditor.template.html +++ b/ang/crmFundingAVK1SonstigeAktivitaet/avk1SonstigeAktivitaetApplicationEditor.template.html @@ -64,7 +64,12 @@

{{ ts('General') }}

value="data.grunddaten.kurzbeschreibungDesInhalts" e-ng-required="true"> - +
+ +
+`

Zeiträume

diff --git a/ang/crmFundingIJB/ijbApplicationEditor.template.html b/ang/crmFundingIJB/ijbApplicationEditor.template.html index ba8661627..9dc96733b 100644 --- a/ang/crmFundingIJB/ijbApplicationEditor.template.html +++ b/ang/crmFundingIJB/ijbApplicationEditor.template.html @@ -66,6 +66,11 @@

Grunddaten

value="data.grunddaten.kurzbeschreibungDesInhalts" e-ng-required="true"> +
+ +

Zeiträume

diff --git a/ang/crmFundingSammelantragKurs/sammelantragKursApplicationEditor.template.html b/ang/crmFundingSammelantragKurs/sammelantragKursApplicationEditor.template.html index be0a8f477..415f1665a 100644 --- a/ang/crmFundingSammelantragKurs/sammelantragKursApplicationEditor.template.html +++ b/ang/crmFundingSammelantragKurs/sammelantragKursApplicationEditor.template.html @@ -64,7 +64,12 @@

{{ ts('General') }}

value="data.grunddaten.kurzbeschreibungDerInhalte" e-ng-required="true"> - +
+ +
+`

Zeiträume

diff --git a/l10n/de_DE/LC_MESSAGES/funding.mo b/l10n/de_DE/LC_MESSAGES/funding.mo index 455f41956..50aaed3cb 100644 Binary files a/l10n/de_DE/LC_MESSAGES/funding.mo and b/l10n/de_DE/LC_MESSAGES/funding.mo differ diff --git a/l10n/de_DE/LC_MESSAGES/funding.po b/l10n/de_DE/LC_MESSAGES/funding.po index 2f96a39a5..619195884 100644 --- a/l10n/de_DE/LC_MESSAGES/funding.po +++ b/l10n/de_DE/LC_MESSAGES/funding.po @@ -30,6 +30,7 @@ msgstr "Währung" #: Civi/Funding/Api4/Action/FundingProgram/GetFieldsAction.php #: Civi/Funding/Api4/Action/FundingTransferContract/GetFieldsAction.php #: ang/crmFunding/case/fundingCase.template.html +#: managed/SavedSearchFundingCases.mgd.php #: managed/SavedSearchFundingProgramControlling.mgd.php #: managed/SavedSearch_Clearings.mgd.php #: managed/SavedSearch_funding_cases.mgd.php @@ -43,6 +44,7 @@ msgstr "Abgerechneter Betrag" #: Civi/Funding/Api4/Action/FundingProgram/GetFieldsAction.php #: Civi/Funding/Api4/Action/FundingTransferContract/GetFieldsAction.php #: ang/crmFunding/case/fundingCase.template.html +#: managed/SavedSearchFundingCases.mgd.php #: managed/SavedSearchFundingProgramControlling.mgd.php #: managed/SavedSearch_Clearings.mgd.php #: managed/SavedSearch_funding_cases.mgd.php @@ -1797,6 +1799,15 @@ msgstr "Rechnerische Prüfung: %status" msgid "Status: %status" msgstr "Status: %status" +#: ang/crmFunding/application/history/applicationProcessActivity.directive.js +#: ang/crmFunding/case/fundingCase.template.html +#: ang/crmFunding/clearing/clearingEditor.template.html +#: ang/crmFundingAVK1SonstigeAktivitaet/avk1SonstigeAktivitaetApplicationEditor.template.html +#: ang/crmFundingIJB/ijbApplicationEditor.template.html +#: ang/crmFundingSammelantragKurs/sammelantragKursApplicationEditor.template.html +msgid "Unknown" +msgstr "Unbekannt" + #: ang/crmFunding/application/history/applicationProcessHistory.template.html msgid "Filter" msgstr "Filter" @@ -1897,6 +1908,44 @@ msgstr "leer" msgid "Type" msgstr "Art" +#: ang/crmFunding/case/permissions/fundingCaseContactRelation.template.html +#: ang/crmFunding/program/newCasePermissions/fundingNewCasePermissions.template.html +#: ang/crmFunding/program/permissions/fundingProgramContactRelation.template.html +msgid "Permissions" +msgstr "Berechtigungen" + +#: ang/crmFunding/clearing/clearingEditor.template.html +#: ang/crmFundingAVK1SonstigeAktivitaet/avk1SonstigeAktivitaetApplicationEditor.template.html +#: ang/crmFundingIJB/ijbApplicationEditor.template.html +#: ang/crmFundingSammelantragKurs/sammelantragKursApplicationEditor.template.html +msgid "Reviewers" +msgstr "Prüfer*innen" + +#: ang/crmFunding/clearing/clearingEditor.template.html +#: ang/crmFundingAVK1SonstigeAktivitaet/avk1SonstigeAktivitaetApplicationEditor.template.html +#: ang/crmFundingIJB/ijbApplicationEditor.template.html +#: ang/crmFundingSammelantragKurs/sammelantragKursApplicationEditor.template.html +msgid "General" +msgstr "Allgemein" + +#: ang/crmFunding/clearing/clearingEditor.template.html +#: ang/crmFundingAVK1SonstigeAktivitaet/avk1SonstigeAktivitaetApplicationEditor.template.html +#: ang/crmFundingIJB/ijbApplicationEditor.template.html +#: ang/crmFundingSammelantragKurs/sammelantragKursApplicationEditor.template.html +#: managed/CustomGroupFundingApplicationTask.mgd.php +#: managed/SavedSearch_Clearings.mgd.php +msgid "Review Content" +msgstr "Fachliche Prüfung" + +#: ang/crmFunding/clearing/clearingEditor.template.html +#: ang/crmFundingAVK1SonstigeAktivitaet/avk1SonstigeAktivitaetApplicationEditor.template.html +#: ang/crmFundingIJB/ijbApplicationEditor.template.html +#: ang/crmFundingSammelantragKurs/sammelantragKursApplicationEditor.template.html +#: managed/CustomGroupFundingApplicationTask.mgd.php +#: managed/SavedSearch_Clearings.mgd.php +msgid "Review Calculative" +msgstr "Rechnerische Prüfung" + #: ang/crmFunding/clearing/clearingSidebar.template.html msgid "" "The aim intended with the funding was achieved. All required proofs are " @@ -2125,10 +2174,22 @@ msgstr "Förderfalltypen" msgid "Funding Application" msgstr "Förderantrag" -#: managed/OptionValue_cg_extend_objects-civicrm_funding_application_process.mgd.php +#: managed/OptionValueCgExtendsFundingProgram.mgd.php +#: managed/SavedSearchFundingCaseApplicationProcesses.mgd.php +#: managed/SavedSearchFundingCases.mgd.php +#: managed/SavedSearch_Clearings.mgd.php +#: managed/SavedSearch_Drawdowns_by_Recipient_and_Funding_Program.mgd.php +msgid "Funding Program" +msgstr "Förderprogramm" + +#: managed/OptionValue_cg_extend_objects-civicrm_funding_application_process.mgd.php CRM/Funding/DAO/ApplicationProcess.php msgid "Application Process" msgstr "Antragsprozess" +#: CRM/Funding/DAO/ApplicationProcess.php +msgid "Application Processes" +msgstr "Antragsprozesse" + #: managed/OptionValue_funding_clearing_create.mgd.php msgid "Activity type for funding clearing creation" msgstr "Aktivitätsart für Erstellung eines Verwendungsnachweises" @@ -2163,6 +2224,19 @@ msgstr "Rückzahlungsforderung" msgid "Table" msgstr "Tabelle" +#: managed/SavedSearchFundingApplicationProcesses.mgd.php +#: managed/SavedSearchFundingCaseApplicationProcesses.mgd.php +#: managed/SavedSearchFundingCaseTypes.mgd.php +#: managed/SavedSearchFundingProgramControlling.mgd.php +#: managed/SavedSearchFundingPrograms.mgd.php +#: managed/SavedSearch_Clearings.mgd.php +msgid "Title" +msgstr "Titel" + +#: managed/SavedSearchFundingApplicationProcesses.mgd.php +msgid "Short Description" +msgstr "Kurzbeschreibung" + #: managed/SavedSearchFundingApplicationProcesses.mgd.php msgid "Clearing Status" msgstr "Verwendungsnachweisstatus" @@ -2210,6 +2284,10 @@ msgstr "Vorlagen verwalten" msgid "Manage external application templates" msgstr "Externe Antragsvorlagen verwalten" +#: managed/SavedSearchFundingCases.mgd.php +msgid "Open case" +msgstr "Fall öffnen" + #: managed/SavedSearchFundingDrawdowns.mgd.php msgid "Requester" msgstr "Anforderer" @@ -2231,10 +2309,19 @@ msgstr "Dokument herunterladen" msgid "Budget" msgstr "Budget" +#: managed/SavedSearchFundingProgramControlling.mgd.php +#: managed/SavedSearchFundingPrograms.mgd.php +msgid "End Date" +msgstr "Enddatum" + #: managed/SavedSearchFundingPrograms.mgd.php msgid "Identifier Prefix" msgstr "Bezeichnerpräfix" +#: managed/SavedSearchFundingPrograms.mgd.php +msgid "Start Date" +msgstr "Startdatum" + #: managed/SavedSearchFundingPrograms.mgd.php msgid "Requests Start Date" msgstr "Startdatum für Anträge" diff --git a/tests/phpunit/Civi/Funding/IJB/Application/JsonSchema/IJBApplicationJsonSchemaTest.php b/tests/phpunit/Civi/Funding/IJB/Application/JsonSchema/IJBApplicationJsonSchemaTest.php index 2bda12a3d..569b42337 100644 --- a/tests/phpunit/Civi/Funding/IJB/Application/JsonSchema/IJBApplicationJsonSchemaTest.php +++ b/tests/phpunit/Civi/Funding/IJB/Application/JsonSchema/IJBApplicationJsonSchemaTest.php @@ -132,6 +132,7 @@ public function testFachkraefteprogrammDeutschland(): void { 'grunddaten' => [ 'titel' => 'Test', 'kurzbeschreibungDesInhalts' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ [ 'beginn' => '2022-08-25', @@ -336,6 +337,7 @@ public function testFachkraefteprogrammDeutschland(): void { static::assertEquals([ 'title' => 'Test', 'short_description' => 'foo bar', + 'funding_application_process_extra.internal_identifier' => 'interne id', 'recipient_contact_id' => 2, 'start_date' => '2022-08-24', 'end_date' => '2022-08-26', @@ -423,6 +425,7 @@ public function testFachkraefteprogrammPartnerland(): void { 'grunddaten' => [ 'titel' => 'Test', 'kurzbeschreibungDesInhalts' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ [ 'beginn' => '2022-08-24', @@ -619,6 +622,7 @@ public function testFachkraefteprogrammPartnerland(): void { static::assertEquals([ 'title' => 'Test', 'short_description' => 'foo bar', + 'funding_application_process_extra.internal_identifier' => 'interne id', 'recipient_contact_id' => 2, 'start_date' => '2022-08-24', 'end_date' => '2022-08-26', @@ -706,6 +710,7 @@ public function testJugendbegegnungDeutschland(): void { 'grunddaten' => [ 'titel' => 'Test', 'kurzbeschreibungDesInhalts' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ [ 'beginn' => '2022-08-24', @@ -908,6 +913,7 @@ public function testJugendbegegnungDeutschland(): void { static::assertEquals([ 'title' => 'Test', 'short_description' => 'foo bar', + 'funding_application_process_extra.internal_identifier' => 'interne id', 'recipient_contact_id' => 2, 'start_date' => '2022-08-24', 'end_date' => '2022-08-26', @@ -995,6 +1001,7 @@ public function testJugendbegegnungPartnerland(): void { 'grunddaten' => [ 'titel' => 'Test', 'kurzbeschreibungDesInhalts' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ [ 'beginn' => '2022-08-24', @@ -1191,6 +1198,7 @@ public function testJugendbegegnungPartnerland(): void { static::assertEquals([ 'title' => 'Test', 'short_description' => 'foo bar', + 'funding_application_process_extra.internal_identifier' => 'interne id', 'recipient_contact_id' => 2, 'start_date' => '2022-08-24', 'end_date' => '2022-08-26', @@ -1276,6 +1284,7 @@ public function testFinanzierungNichtAusgeglichen(): void { 'grunddaten' => (object) [ 'titel' => 'Test', 'kurzbeschreibungDesInhalts' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ (object) [ 'beginn' => '2022-08-24', diff --git a/tests/phpunit/Civi/Funding/IJB/Report/IJBReportFormFactoryTest.php b/tests/phpunit/Civi/Funding/IJB/Report/IJBReportFormFactoryTest.php index e5e919429..da69cd897 100644 --- a/tests/phpunit/Civi/Funding/IJB/Report/IJBReportFormFactoryTest.php +++ b/tests/phpunit/Civi/Funding/IJB/Report/IJBReportFormFactoryTest.php @@ -78,6 +78,7 @@ public function testValidation(): void { $grunddaten = (object) [ 'titel' => 'Test', 'kurzbeschreibungDesInhalts' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ (object) [ 'beginn' => '2022-08-24', @@ -234,6 +235,7 @@ public function testValidationSpracheAndere(): void { $grunddaten = (object) [ 'titel' => 'Test', 'kurzbeschreibungDesInhalts' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ (object) [ 'beginn' => '2022-08-24', diff --git a/tests/phpunit/Civi/Funding/SammelantragKurs/Application/JsonSchema/KursApplicationJsonSchemaTest.php b/tests/phpunit/Civi/Funding/SammelantragKurs/Application/JsonSchema/KursApplicationJsonSchemaTest.php index 5d59b556d..d332216dc 100644 --- a/tests/phpunit/Civi/Funding/SammelantragKurs/Application/JsonSchema/KursApplicationJsonSchemaTest.php +++ b/tests/phpunit/Civi/Funding/SammelantragKurs/Application/JsonSchema/KursApplicationJsonSchemaTest.php @@ -81,6 +81,7 @@ public function testJsonSchema(): void { 'grunddaten' => [ 'titel' => 'Test', 'kurzbeschreibungDerInhalte' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ [ 'beginn' => '2022-08-25', @@ -157,6 +158,7 @@ public function testJsonSchema(): void { static::assertEquals([ 'title' => 'Test', 'short_description' => 'foo bar', + 'funding_application_process_extra.internal_identifier' => 'interne id', 'start_date' => '2022-08-24', 'end_date' => '2022-08-26', 'amount_requested' => $beantragterZuschuss, @@ -194,6 +196,7 @@ public function testJsonSchemaDefaults(): void { 'grunddaten' => [ 'titel' => 'Test', 'kurzbeschreibungDerInhalte' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ [ 'beginn' => '2022-08-24', @@ -266,6 +269,7 @@ public function testJsonSchemaDefaults(): void { static::assertEquals([ 'title' => 'Test', 'short_description' => 'foo bar', + 'funding_application_process_extra.internal_identifier' => 'interne id', 'start_date' => '2022-08-24', 'end_date' => '2022-08-26', 'amount_requested' => $beantragterZuschuss, diff --git a/tests/phpunit/Civi/Funding/SammelantragKurs/Report/KursReportFormFactoryTest.php b/tests/phpunit/Civi/Funding/SammelantragKurs/Report/KursReportFormFactoryTest.php index 3f6e39caf..b8e241d2f 100644 --- a/tests/phpunit/Civi/Funding/SammelantragKurs/Report/KursReportFormFactoryTest.php +++ b/tests/phpunit/Civi/Funding/SammelantragKurs/Report/KursReportFormFactoryTest.php @@ -51,6 +51,7 @@ public function testSaveFieldsNotRequired(): void { $grunddaten = (object) [ 'titel' => 'Test', 'kurzbeschreibungDerInhalte' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ (object) [ 'beginn' => '2022-08-24', @@ -97,6 +98,7 @@ public function testValidation(): void { $grunddaten = (object) [ 'titel' => 'Test', 'kurzbeschreibungDerInhalte' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ (object) [ 'beginn' => '2022-08-24', diff --git a/tests/phpunit/Civi/Funding/SonstigeAktivitaet/JsonSchema/AVK1JsonSchemaTest.php b/tests/phpunit/Civi/Funding/SonstigeAktivitaet/JsonSchema/AVK1JsonSchemaTest.php index 06f3f0bdf..9dfeee50e 100644 --- a/tests/phpunit/Civi/Funding/SonstigeAktivitaet/JsonSchema/AVK1JsonSchemaTest.php +++ b/tests/phpunit/Civi/Funding/SonstigeAktivitaet/JsonSchema/AVK1JsonSchemaTest.php @@ -71,6 +71,7 @@ public function testJsonSchema(): void { 'grunddaten' => [ 'titel' => 'Test', 'kurzbeschreibungDesInhalts' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ [ 'beginn' => '2022-08-25', @@ -224,6 +225,7 @@ public function testJsonSchema(): void { static::assertEquals([ 'title' => 'Test', 'short_description' => 'foo bar', + 'funding_application_process_extra.internal_identifier' => 'interne id', 'recipient_contact_id' => 2, 'start_date' => '2022-08-24', 'end_date' => '2022-08-25', diff --git a/tests/phpunit/Civi/Funding/SonstigeAktivitaet/Report/AVK1ReportFormFactoryTest.php b/tests/phpunit/Civi/Funding/SonstigeAktivitaet/Report/AVK1ReportFormFactoryTest.php index 55abae27e..8177b95ec 100644 --- a/tests/phpunit/Civi/Funding/SonstigeAktivitaet/Report/AVK1ReportFormFactoryTest.php +++ b/tests/phpunit/Civi/Funding/SonstigeAktivitaet/Report/AVK1ReportFormFactoryTest.php @@ -51,6 +51,7 @@ public function testSaveFieldsNotRequired(): void { $grunddaten = (object) [ 'titel' => 'Test', 'kurzbeschreibungDesInhalts' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ (object) [ 'beginn' => '2022-08-24', @@ -84,6 +85,7 @@ public function testValidation(): void { $grunddaten = (object) [ 'titel' => 'Test', 'kurzbeschreibungDesInhalts' => 'foo bar', + 'internerBezeichner' => 'interne id', 'zeitraeume' => [ (object) [ 'beginn' => '2022-08-24',