From 0c8d2bff355e75456e94272cd8d1aa2ba8f4129e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 12 Dec 2018 16:07:46 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1024848][Umsetzung
Modul Vertriebsprojekt - Mitbewerber-Management]
---
.../SalesprojectCompetition_entity.aod | 39 +++++-
.../possibleItemsProcess.js | 4 +
.../org_strength/possibleItemsProcess.js | 4 +
.../org_weakness/possibleItemsProcess.js | 4 +
.../_____LANGUAGE_EXTRA.aod | 96 +--------------
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 112 +-----------------
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 96 +--------------
neonView/OrgAttr_view/OrgAttr_view.aod | 3 +-
.../SalesprojectCompetitionPreview_view.aod | 26 ++++
.../example_salesproject/SALESPROJECT_gfk.xml | 4 +-
10 files changed, 87 insertions(+), 301 deletions(-)
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/org_price_politics/possibleItemsProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/org_strength/possibleItemsProcess.js
create mode 100644 entity/SalesprojectCompetition_entity/entityfields/org_weakness/possibleItemsProcess.js
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 221ec8bad9..a80501f5c2 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -81,9 +81,15 @@
</entityField>
<entityField>
<name>ORG_NAME</name>
+ <state>READONLY</state>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
</entityField>
<entityField>
<name>ORG_ORGID</name>
+ <state>AUTO</state>
</entityField>
<entityOutgoingField>
<name>SalesprojectCompetitionOrg_dfo</name>
@@ -102,6 +108,21 @@
</entityParameter>
</children>
</entityOutgoingField>
+ <entityField>
+ <name>ORG_PRICE_POLITICS</name>
+ <title>Price Politics</title>
+ <possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/org_price_politics/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityField>
+ <name>ORG_STRENGTH</name>
+ <title>Strength</title>
+ <possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/org_strength/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ <entityField>
+ <name>ORG_WEAKNESS</name>
+ <title>Weakness</title>
+ <possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/org_weakness/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -111,18 +132,18 @@
<conditionProcess>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
- <name>03b7fdf5-e557-4818-9aae-3a30797814c4</name>
+ <name>40929203-c34a-4320-b83d-57a60c851a89</name>
<tableName>SALESPROJECT_COMPETITION</tableName>
<primaryKey>SALESPROJECT_COMPETITIONID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>dfbd027c-51e5-4ca6-8753-5a33759b5ec5</name>
+ <name>efb1f8fb-8451-4cc9-a25f-b896d5e1ae53</name>
<tableName>ORG</tableName>
<primaryKey>ORGID</primaryKey>
<isUIDTable v="false" />
- <readonly v="true" />
+ <readonly v="false" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
@@ -178,6 +199,18 @@
<name>USER_NEW.value</name>
<recordfield>SALESPROJECT_COMPETITION.USER_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_PRICE_POLITICS.value</name>
+ <recordfield>ORG.PRICE_POLITICS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_STRENGTH.value</name>
+ <recordfield>ORG.STRENGTH</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_WEAKNESS.value</name>
+ <recordfield>ORG.WEAKNESS</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/org_price_politics/possibleItemsProcess.js b/entity/SalesprojectCompetition_entity/entityfields/org_price_politics/possibleItemsProcess.js
new file mode 100644
index 0000000000..4e1c101c2a
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/org_price_politics/possibleItemsProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.object(KeywordUtils.getStandardArray("SALESPROJECT.PRICE_POLITICS"));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/org_strength/possibleItemsProcess.js b/entity/SalesprojectCompetition_entity/entityfields/org_strength/possibleItemsProcess.js
new file mode 100644
index 0000000000..ecb086cea2
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/org_strength/possibleItemsProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.object(KeywordUtils.getStandardArray("SALESPROJECT.STRENGTH"));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/org_weakness/possibleItemsProcess.js b/entity/SalesprojectCompetition_entity/entityfields/org_weakness/possibleItemsProcess.js
new file mode 100644
index 0000000000..0d46206dc2
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/org_weakness/possibleItemsProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.object(KeywordUtils.getStandardArray("SALESPROJECT.WEAKNESS"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index ebe8dc067f..f0b76ea105 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -105,9 +105,6 @@
<entry>
<key>English (United Kingdom)</key>
</entry>
- <entry>
- <key>Social</key>
- </entry>
<entry>
<key>Contactmanagement</key>
</entry>
@@ -144,9 +141,6 @@
<entry>
<key>the param \&quot;%0\&quot; in \&quot;%1\&quot; is mandatory and has to be set</key>
</entry>
- <entry>
- <key>yyyy-MM-dd</key>
- </entry>
<entry>
<key>Address</key>
</entry>
@@ -192,15 +186,9 @@
<entry>
<key>Subject</key>
</entry>
- <entry>
- <key>changed on %0 by %1</key>
- </entry>
<entry>
<key>Post office box</key>
</entry>
- <entry>
- <key>created on %0 by %1</key>
- </entry>
<entry>
<key>Delivery address</key>
</entry>
@@ -282,15 +270,6 @@
<entry>
<key>Ein Gruppentermin kann nur durch den Organisator bearbeitet werden.</key>
</entry>
- <entry>
- <key>Communication Other</key>
- </entry>
- <entry>
- <key>Communication Phone</key>
- </entry>
- <entry>
- <key>Communication E-Mail</key>
- </entry>
<entry>
<key>standard address</key>
</entry>
@@ -549,9 +528,6 @@
<entry>
<key>Volume</key>
</entry>
- <entry>
- <key>The project number already exists!</key>
- </entry>
<entry>
<key>Partial order</key>
</entry>
@@ -579,9 +555,6 @@
<entry>
<key>Presentation preparation</key>
</entry>
- <entry>
- <key>Waiting for request</key>
- </entry>
<entry>
<key>Specifications in progress</key>
</entry>
@@ -591,9 +564,6 @@
<entry>
<key>Lead</key>
</entry>
- <entry>
- <key>Statement given</key>
- </entry>
<entry>
<key>Total net</key>
</entry>
@@ -666,24 +636,9 @@
<entry>
<key>Offeritem</key>
</entry>
- <entry>
- <key>New offer verison</key>
- </entry>
- <entry>
- <key>ISO3 Code</key>
- </entry>
<entry>
<key>zusagen</key>
</entry>
- <entry>
- <key>EU Member</key>
- </entry>
- <entry>
- <key>Zip exists</key>
- </entry>
- <entry>
- <key>ISO2 Code</key>
- </entry>
<entry>
<key>Sum</key>
</entry>
@@ -705,36 +660,15 @@
<entry>
<key>Countries</key>
</entry>
- <entry>
- <key>Euro zone</key>
- </entry>
- <entry>
- <key>NAME</key>
- </entry>
<entry>
<key>Options</key>
</entry>
- <entry>
- <key>Country code</key>
- </entry>
- <entry>
- <key>Country Code</key>
- </entry>
- <entry>
- <key>PO-box name</key>
- </entry>
- <entry>
- <key>Adress format</key>
- </entry>
<entry>
<key>vielleicht</key>
</entry>
<entry>
<key>Administration</key>
</entry>
- <entry>
- <key>Flag</key>
- </entry>
<entry>
<key>Total gross</key>
</entry>
@@ -744,18 +678,12 @@
<entry>
<key>Identical price list found!</key>
</entry>
- <entry>
- <key>Current purchase/sales price</key>
- </entry>
<entry>
<key>Parts list</key>
</entry>
<entry>
<key>${THOUSAND_SHORT}</key>
</entry>
- <entry>
- <key>Pos</key>
- </entry>
<entry>
<key>Project_references available</key>
</entry>
@@ -855,9 +783,6 @@
<entry>
<key>Other_existing Customer</key>
</entry>
- <entry>
- <key>Product_GuI</key>
- </entry>
<entry>
<key>Other_unknown</key>
</entry>
@@ -876,18 +801,12 @@
<entry>
<key>Project_volume</key>
</entry>
- <entry>
- <key>Competitor</key>
- </entry>
<entry>
<key>Excreted</key>
</entry>
<entry>
<key>Reason</key>
</entry>
- <entry>
- <key>Project adviser</key>
- </entry>
<entry>
<key>Decision maker</key>
</entry>
@@ -906,9 +825,6 @@
<entry>
<key>Dateiname</key>
</entry>
- <entry>
- <key>Dokumente</key>
- </entry>
<entry>
<key>Dateityp</key>
</entry>
@@ -930,9 +846,6 @@
<entry>
<key>Dateigröße</key>
</entry>
- <entry>
- <key>Project member</key>
- </entry>
<entry>
<key>Member</key>
</entry>
@@ -1089,9 +1002,6 @@
<entry>
<key>Internal sales manager</key>
</entry>
- <entry>
- <key>Prices</key>
- </entry>
<entry>
<key>keine Standard-E-Mail Büro vorhanden !</key>
</entry>
@@ -1191,9 +1101,6 @@
<entry>
<key>#,##0.00</key>
</entry>
- <entry>
- <key>Default address</key>
- </entry>
<entry>
<key>jDitoRC</key>
</entry>
@@ -1233,6 +1140,9 @@
<entry>
<key>Contact / Company</key>
</entry>
+ <entry>
+ <key>Price Politics</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index c0939a340a..68e686b8d9 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6,10 +6,6 @@
<country></country>
<variant></variant>
<keyValueMap>
- <entry>
- <key>Current purchase/sales price</key>
- <value>Aktueller EK/VK Preis</value>
- </entry>
<entry>
<key>Company</key>
<value>Firma</value>
@@ -145,10 +141,6 @@
<key>English (United Kingdom)</key>
<value>Englisch (Vereinigtes Königreich)</value>
</entry>
- <entry>
- <key>Social</key>
- <value></value>
- </entry>
<entry>
<key>Contactmanagement</key>
<value>Kontaktmanagement</value>
@@ -197,11 +189,6 @@
<key>the param \&quot;%0\&quot; in \&quot;%1\&quot; is mandatory and has to be set</key>
<value></value>
</entry>
- <entry>
- <key>yyyy-MM-dd</key>
- <value>dd.MM.yyyy
-</value>
- </entry>
<entry>
<key>Address</key>
<value>Adresse</value>
@@ -262,18 +249,10 @@
<key>Subject</key>
<value>Betreff</value>
</entry>
- <entry>
- <key>changed on %0 by %1</key>
- <value>Geändert am %0 von %1</value>
- </entry>
<entry>
<key>Post office box</key>
<value>Postfach</value>
</entry>
- <entry>
- <key>created on %0 by %1</key>
- <value>Erstellt am %0 von %1</value>
- </entry>
<entry>
<key>Delivery address</key>
<value>Lieferadresse</value>
@@ -372,18 +351,6 @@
<key>Ein Gruppentermin kann nur durch den Organisator bearbeitet werden.</key>
<value></value>
</entry>
- <entry>
- <key>Communication Other</key>
- <value>Kommunikation Sonstige</value>
- </entry>
- <entry>
- <key>Communication Phone</key>
- <value>Kommunikation Telefon</value>
- </entry>
- <entry>
- <key>Communication E-Mail</key>
- <value>Kommunikation E-Mail</value>
- </entry>
<entry>
<key>standard address</key>
<value>Standardadresse</value>
@@ -727,10 +694,6 @@
<key>Volume</key>
<value>Volumen</value>
</entry>
- <entry>
- <key>The project number already exists!</key>
- <value>Die Projektnummer existiert bereits!</value>
- </entry>
<entry>
<key>Partial order</key>
<value>Teilauftrag</value>
@@ -767,10 +730,6 @@
<key>Presentation preparation</key>
<value>Präsentationsvorbereitung</value>
</entry>
- <entry>
- <key>Waiting for request</key>
- <value>Auf Anforderungen warten</value>
- </entry>
<entry>
<key>Specifications in progress</key>
<value>Lastenheft in Bearbeitung</value>
@@ -783,10 +742,6 @@
<key>Lead</key>
<value>Lead</value>
</entry>
- <entry>
- <key>Statement given</key>
- <value>Stellungnahme abgeben</value>
- </entry>
<entry>
<key>Total net</key>
<value>Betrag netto</value>
@@ -878,25 +833,9 @@
<key>Offeritem</key>
<value>Angebotsposten</value>
</entry>
- <entry>
- <key>New offer verison</key>
- <value>Neue Angebotsversion</value>
- </entry>
- <entry>
- <key>ISO3 Code</key>
- </entry>
<entry>
<key>zusagen</key>
</entry>
- <entry>
- <key>EU Member</key>
- </entry>
- <entry>
- <key>Zip exists</key>
- </entry>
- <entry>
- <key>ISO2 Code</key>
- </entry>
<entry>
<key>Sum</key>
<value>Summe</value>
@@ -919,39 +858,15 @@
<entry>
<key>Countries</key>
</entry>
- <entry>
- <key>Euro zone</key>
- </entry>
- <entry>
- <key>Prices</key>
- </entry>
- <entry>
- <key>NAME</key>
- </entry>
<entry>
<key>Options</key>
</entry>
- <entry>
- <key>Country code</key>
- </entry>
- <entry>
- <key>Country Code</key>
- </entry>
- <entry>
- <key>PO-box name</key>
- </entry>
- <entry>
- <key>Adress format</key>
- </entry>
<entry>
<key>vielleicht</key>
</entry>
<entry>
<key>Administration</key>
</entry>
- <entry>
- <key>Flag</key>
- </entry>
<entry>
<key>Total gross</key>
<value>Betrag brutto</value>
@@ -972,9 +887,6 @@
<key>${THOUSAND_SHORT}</key>
<value>T</value>
</entry>
- <entry>
- <key>Pos</key>
- </entry>
<entry>
<key>Project_references available</key>
<value>Projekt_Referenzen vorhanden</value>
@@ -1138,10 +1050,6 @@
<key>Project_volume</key>
<value>Projekt_Volumen</value>
</entry>
- <entry>
- <key>Competitor</key>
- <value>Mitbewerber</value>
- </entry>
<entry>
<key>Excreted</key>
<value>Ausgeschieden
@@ -1151,10 +1059,6 @@
<key>Reason</key>
<value>Begründung</value>
</entry>
- <entry>
- <key>Project adviser</key>
- <value>Berater</value>
- </entry>
<entry>
<key>Decision maker</key>
<value>Entscheider</value>
@@ -1177,9 +1081,6 @@
<entry>
<key>Dateiname</key>
</entry>
- <entry>
- <key>Dokumente</key>
- </entry>
<entry>
<key>Dateityp</key>
</entry>
@@ -1203,10 +1104,6 @@
<entry>
<key>Dateigröße</key>
</entry>
- <entry>
- <key>Project member</key>
- <value>Projektteam</value>
- </entry>
<entry>
<key>Member</key>
</entry>
@@ -1381,9 +1278,6 @@
<key>Internal sales manager</key>
<value>Vertrieb ID</value>
</entry>
- <entry>
- <key>Product_GuI</key>
- </entry>
<entry>
<key>keine Standard-E-Mail Büro vorhanden !</key>
</entry>
@@ -1486,9 +1380,6 @@
<entry>
<key>#,##0.00</key>
</entry>
- <entry>
- <key>Default address</key>
- </entry>
<entry>
<key>jDitoRC</key>
</entry>
@@ -1534,6 +1425,9 @@
<entry>
<key>Contact / Company</key>
</entry>
+ <entry>
+ <key>Price Politics</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 88ae4bb1f2..7f66dfd832 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -109,9 +109,6 @@
<entry>
<key>English (United Kingdom)</key>
</entry>
- <entry>
- <key>Social</key>
- </entry>
<entry>
<key>Contactmanagement</key>
</entry>
@@ -148,9 +145,6 @@
<entry>
<key>the param \&quot;%0\&quot; in \&quot;%1\&quot; is mandatory and has to be set</key>
</entry>
- <entry>
- <key>yyyy-MM-dd</key>
- </entry>
<entry>
<key>Address</key>
</entry>
@@ -197,15 +191,9 @@
<entry>
<key>Subject</key>
</entry>
- <entry>
- <key>changed on %0 by %1</key>
- </entry>
<entry>
<key>Post office box</key>
</entry>
- <entry>
- <key>created on %0 by %1</key>
- </entry>
<entry>
<key>Delivery address</key>
</entry>
@@ -287,18 +275,6 @@
<entry>
<key>Ein Gruppentermin kann nur durch den Organisator bearbeitet werden.</key>
</entry>
- <entry>
- <key>Prices</key>
- </entry>
- <entry>
- <key>Communication Other</key>
- </entry>
- <entry>
- <key>Communication Phone</key>
- </entry>
- <entry>
- <key>Communication E-Mail</key>
- </entry>
<entry>
<key>standard address</key>
</entry>
@@ -560,9 +536,6 @@
<entry>
<key>Volume</key>
</entry>
- <entry>
- <key>The project number already exists!</key>
- </entry>
<entry>
<key>Partial order</key>
</entry>
@@ -590,9 +563,6 @@
<entry>
<key>Presentation preparation</key>
</entry>
- <entry>
- <key>Waiting for request</key>
- </entry>
<entry>
<key>Specifications in progress</key>
</entry>
@@ -602,9 +572,6 @@
<entry>
<key>Lead</key>
</entry>
- <entry>
- <key>Statement given</key>
- </entry>
<entry>
<key>Total net</key>
</entry>
@@ -677,24 +644,9 @@
<entry>
<key>Offeritem</key>
</entry>
- <entry>
- <key>New offer verison</key>
- </entry>
- <entry>
- <key>ISO3 Code</key>
- </entry>
<entry>
<key>zusagen</key>
</entry>
- <entry>
- <key>EU Member</key>
- </entry>
- <entry>
- <key>Zip exists</key>
- </entry>
- <entry>
- <key>ISO2 Code</key>
- </entry>
<entry>
<key>Sum</key>
</entry>
@@ -716,36 +668,15 @@
<entry>
<key>Countries</key>
</entry>
- <entry>
- <key>Euro zone</key>
- </entry>
- <entry>
- <key>NAME</key>
- </entry>
<entry>
<key>Options</key>
</entry>
- <entry>
- <key>Country code</key>
- </entry>
- <entry>
- <key>Country Code</key>
- </entry>
- <entry>
- <key>PO-box name</key>
- </entry>
- <entry>
- <key>Adress format</key>
- </entry>
<entry>
<key>vielleicht</key>
</entry>
<entry>
<key>Administration</key>
</entry>
- <entry>
- <key>Flag</key>
- </entry>
<entry>
<key>Total gross</key>
</entry>
@@ -756,9 +687,6 @@
<entry>
<key>Identical price list found!</key>
</entry>
- <entry>
- <key>Current purchase/sales price</key>
- </entry>
<entry>
<key>Parts list</key>
</entry>
@@ -766,9 +694,6 @@
<key>${THOUSAND_SHORT}</key>
<value>T</value>
</entry>
- <entry>
- <key>Pos</key>
- </entry>
<entry>
<key>Project_references available</key>
</entry>
@@ -870,9 +795,6 @@
<entry>
<key>Other_existing Customer</key>
</entry>
- <entry>
- <key>Product_GuI</key>
- </entry>
<entry>
<key>Other_unknown</key>
</entry>
@@ -891,18 +813,12 @@
<entry>
<key>Project_volume</key>
</entry>
- <entry>
- <key>Competitor</key>
- </entry>
<entry>
<key>Excreted</key>
</entry>
<entry>
<key>Reason</key>
</entry>
- <entry>
- <key>Project adviser</key>
- </entry>
<entry>
<key>Decision maker</key>
</entry>
@@ -921,9 +837,6 @@
<entry>
<key>Dateiname</key>
</entry>
- <entry>
- <key>Dokumente</key>
- </entry>
<entry>
<key>Dateityp</key>
</entry>
@@ -945,9 +858,6 @@
<entry>
<key>Dateigröße</key>
</entry>
- <entry>
- <key>Project member</key>
- </entry>
<entry>
<key>Member</key>
</entry>
@@ -1233,9 +1143,6 @@
<entry>
<key>Edit defaults</key>
</entry>
- <entry>
- <key>Default address</key>
- </entry>
<entry>
<key>Minutes</key>
</entry>
@@ -1248,6 +1155,9 @@
<entry>
<key>Contact / Company</key>
</entry>
+ <entry>
+ <key>Price Politics</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/OrgAttr_view/OrgAttr_view.aod b/neonView/OrgAttr_view/OrgAttr_view.aod
index 0039829f61..f33fad0fa6 100644
--- a/neonView/OrgAttr_view/OrgAttr_view.aod
+++ b/neonView/OrgAttr_view/OrgAttr_view.aod
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>OrgAttr_view</name>
- <description>TODO: diese Felder als Attribute implementieren!!!</description>
+ <description>TODO: View verknüpfung von generics momentan nicht möglich! Desshalb habe ich die Felder nochmal direkt verknüpft, damit es zumindest nutzbar ist.
+TODO: diese Felder werden später als Attribute implementiert</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
index cc0ca01caa..1328565b6d 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
@@ -32,6 +32,32 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <genericViewTemplate>
+ <name>OrgAttrWorkaround_template</name>
+ <showDrawer v="true" />
+ <drawerCaption>Attributes</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>9cf17ad8-d91f-4445-b66c-9227bc237787</name>
+ <entityField>ORG_PRICE_POLITICS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e9d9fefd-3493-458e-b9aa-a0300de4f771</name>
+ <entityField>ORG_STRENGTH</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>032e932c-038c-4a74-94e8-39e0be31fbae</name>
+ <entityField>ORG_WEAKNESS</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>IgnoreNext-info_template</name>
+ <showDrawer v="true" />
+ <drawerCaption>Ab hier voerst ignorieren! Fehlende Funktionalität</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ </genericViewTemplate>
<neonViewReference>
<name>3ad88e2c-b159-4c97-b81f-beb689b0fc1c</name>
<entityField>SalesprojectCompetitionOrg_dfo</entityField>
diff --git a/others/db_changes/data/example_salesproject/SALESPROJECT_gfk.xml b/others/db_changes/data/example_salesproject/SALESPROJECT_gfk.xml
index a6aca25bd2..94038760b1 100644
--- a/others/db_changes/data/example_salesproject/SALESPROJECT_gfk.xml
+++ b/others/db_changes/data/example_salesproject/SALESPROJECT_gfk.xml
@@ -63,7 +63,7 @@
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="DATE_CANCELLED" valueDate="2018-06-13T09:03:43"/>
<column name="INFO" value="starkes Prozess Know-How, wird gefährlich für uns. Dazu private Verbindungen"/>
- <column name="RELATION_ID" value="e5a0bbdb-6cc4-4889-97ab-dc5143fbeac2"/>
+ <column name="RELATION_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
<column name="STATUS" valueNumeric="1"/>
</insert>
@@ -72,7 +72,7 @@
<column name="USER_NEW" value="admin"/>
<column name="DATE_NEW" valueDate="2018-06-13T09:03:43"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="RELATION_ID" value="6be19532-e7fa-11e8-9f32-f2801f1b9fd1"/>
+ <column name="RELATION_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="SALESPROJECT_ROLE" valueNumeric="1"/>
</insert>
--
GitLab