From e73af877611f9a617fdba9775758a1c6dd3fa692 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 12 Feb 2019 13:10:03 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.:
1032624][Vertriebsprojekt -Bei den Mitbewerber soll die Phase mit aufgenommen
werden] [Projekt: Entwicklung - Neon][TicketNr.: 1032627][Vertriebsprojekt -
Bei der Herkunft soll der Titel Eingangsdatum in Datum umbenannt werden]
---
aliasDefinition/Data_alias/Data_alias.aod | 14 ++++++++++++++
.../SalesprojectCompetition_entity.aod | 9 +++++++++
.../entityfields/phase/possibleItemsProcess.js | 4 ++++
.../SalesprojectSource_entity.aod | 2 +-
.../SalesprojectCompetitionEdit_view.aod | 4 ++++
.../SalesprojectCompetitionFilter_view.aod | 6 ++++++
.../SalesprojectCompetitionPreview_view.aod | 4 ++++
.../struct/create_salesproject_competition.xml | 1 +
8 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/phase/possibleItemsProcess.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 8051ca6e7d..8a080c5eca 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -2600,6 +2600,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>PHASE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 735fe13730..91d2b468f1 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -132,6 +132,11 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>PHASE</name>
+ <title>Phase</title>
+ <possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/phase/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -212,6 +217,10 @@
<name>REASON.displayValue</name>
<expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/reason.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PHASE.value</name>
+ <recordfield>SALESPROJECT_COMPETITION.PHASE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/phase/possibleItemsProcess.js b/entity/SalesprojectCompetition_entity/entityfields/phase/possibleItemsProcess.js
new file mode 100644
index 0000000000..6b3cab17a0
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/phase/possibleItemsProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.object(KeywordUtils.getStandardArray("SALESPROJECT.PHASE"));
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index c12188160e..4d23f20ff8 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -30,7 +30,7 @@
</entityParameter>
<entityField>
<name>ENTRYDATE</name>
- <title>Entrydate</title>
+ <title>Date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
</entityField>
diff --git a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
index 4de2986da9..ada62137a1 100644
--- a/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
+++ b/neonView/SalesprojectCompetitionEdit_view/SalesprojectCompetitionEdit_view.aod
@@ -17,6 +17,10 @@
<name>8b4c3245-7b3a-4cd0-90f0-09631e2dbde8</name>
<entityField>RELATION_ID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>d6e1eaf9-3269-4350-a1a8-3f6517a167cf</name>
+ <entityField>PHASE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>cdbba6a7-59d1-4831-b098-98a82ad46444</name>
<entityField>STATUS</entityField>
diff --git a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
index e72173fda6..ab3e8f56c6 100644
--- a/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
+++ b/neonView/SalesprojectCompetitionFilter_view/SalesprojectCompetitionFilter_view.aod
@@ -18,6 +18,12 @@
<name>511ea459-1b6f-41e8-b35a-0f67361c82eb</name>
<entityField>RELATION_ID</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>5d146f0e-f0c7-4e7e-82e6-2b24bc241001</name>
+ <entityField>PHASE</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
<neonTableColumn>
<name>322f7067-83ac-486e-9540-16d693775bdb</name>
<entityField>STATUS</entityField>
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
index 81e1139a44..8ad250e11b 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
@@ -18,6 +18,10 @@
<name>SalesprojectCompetitionInfo_template</name>
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>b8f0210d-21fe-4ee8-9364-06f7369a0ef9</name>
+ <entityField>PHASE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>33d74022-ccf9-47e7-8e24-6a1cedb1274e</name>
<entityField>STATUS</entityField>
diff --git a/others/db_changes/data_alias/struct/create_salesproject_competition.xml b/others/db_changes/data_alias/struct/create_salesproject_competition.xml
index 547bd445a9..8a7b5330fa 100644
--- a/others/db_changes/data_alias/struct/create_salesproject_competition.xml
+++ b/others/db_changes/data_alias/struct/create_salesproject_competition.xml
@@ -15,6 +15,7 @@
<column name="INFO" type="NCLOB"/>
<column name="REASON" type="CHAR(36)"/>
<column name="STATUS" type="INTEGER"/>
+ <column name="PHASE" type="INTEGER"/>
</createTable>
</changeSet>
--
GitLab