From cf0e9b6bd53e3cc96eef096771c2020f4ba5516c Mon Sep 17 00:00:00 2001 From: "d.buechler" <d.buechler@adito.de> Date: Wed, 27 Mar 2019 10:19:12 +0100 Subject: [PATCH] =?UTF-8?q?Es=20gibt=20eine=20neue=20Zeile=20zum=20festleg?= =?UTF-8?q?en=20der=20maximalen=20Teilnehmer=20pro=20Schritt=20Zus=C3=A4tz?= =?UTF-8?q?liche=20Infos=20im=20KampagnenPreview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entity/Campaign_entity/Campaign_entity.aod | 4 ++-- .../CampaignPreview_view/CampaignPreview_view.aod | 15 +++++++++++++++ .../CampaignManagement/create_campaignStep.xml | 3 +++ .../_____PREFERENCES_PROJECT.aod | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod index fadf8817148..6303abe1cdc 100644 --- a/entity/Campaign_entity/Campaign_entity.aod +++ b/entity/Campaign_entity/Campaign_entity.aod @@ -37,7 +37,7 @@ </entityField> <entityField> <name>EMPLOYEE_CONTACT_ID</name> - <title>Zuständiger</title> + <title>Hauptverantwortlicher</title> <mandatory v="true" /> <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js</valueProcess> </entityField> @@ -111,7 +111,7 @@ <alias>Data_alias</alias> <linkInformation> <linkInformation> - <name>70b9dff6-b0e5-4d3a-a13c-7f299d956115</name> + <name>f3893829-3af2-4e55-ae85-c3a24411a8b8</name> <tableName>CAMPAIGN</tableName> <primaryKey>CAMPAIGNID</primaryKey> <isUIDTable v="true" /> diff --git a/neonView/CampaignPreview_view/CampaignPreview_view.aod b/neonView/CampaignPreview_view/CampaignPreview_view.aod index e643d695046..c528f890146 100644 --- a/neonView/CampaignPreview_view/CampaignPreview_view.aod +++ b/neonView/CampaignPreview_view/CampaignPreview_view.aod @@ -17,5 +17,20 @@ <descriptionField>DESCRIPTION</descriptionField> <entityField>#ENTITY</entityField> </cardViewTemplate> + <genericViewTemplate> + <name>TimespanGeneric</name> + <entityField>#ENTITY</entityField> + <title>Kampagnenzeitraum</title> + <fields> + <entityFieldLink> + <name>1cf03051-be32-4ff8-9788-6dbc024f086f</name> + <entityField>DATE_START</entityField> + </entityFieldLink> + <entityFieldLink> + <name>a52607c9-da9c-4894-acc6-f31024510d6d</name> + <entityField>DATE_END</entityField> + </entityFieldLink> + </fields> + </genericViewTemplate> </children> </neonView> diff --git a/others/db_changes/data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml b/others/db_changes/data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml index 231c16a5306..408160e05bc 100644 --- a/others/db_changes/data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml +++ b/others/db_changes/data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml @@ -26,6 +26,9 @@ <column name="SORTING" type="INTEGER"> <constraints nullable="false"/> </column> + <column name="MAXPARTICIPANTS" type="INTEGER"> + <constraints nullable="false"/> + </column> <column name="USER_NEW" type="NVARCHAR(50)"> <constraints nullable="false"/> </column> diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod index e075af9a3c2..2e627c2e517 100644 --- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod +++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod @@ -14,7 +14,7 @@ <value></value> </entry> <entry> - <key>auswärts</key> + <key>auswärts</key> <value></value> </entry> <entry> -- GitLab