[Projekt: Entwicklung - Neon][TicketNr.: 1034871][Angebot - Im Kontakt fehlt der Reiter Angebot]

entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js

@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 import("Attribute_lib");
 
-result.string(AttributeUtil.getFullAttributeName(vars.get("$field.AB_ATTRIBUTEID")));
\ No newline at end of file
+result.string(AttributeUtil.getFullAttributeName(vars.get("$field.AB_ATTRIBUTEID")));

entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js

+import("system.translate");
 import("system.vars");
 import("system.result");
 import("Keyword_lib");
 
-var cType = vars.get("$field.CONTRACTTYPE");
-var cCode = vars.get("$field.CONTRACTCODE");
+var contractType = KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, vars.get("$field.CONTRACTTYPE"));
+var contractCode = vars.get("$field.CONTRACTCODE");
 
-result.string(KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, cType) + " " + cCode);
\ No newline at end of file
+result.string((contractType || translate.text("Contract")) + " " + contractCode);
\ No newline at end of file

entity/Offer_entity/Offer_entity.aod

@@ -395,6 +395,28 @@
       <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
       <iconId>NEON:HISTORY</iconId>
     </entityActionField>
+    <entityProvider>
+      <name>ContactOffers</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Offers</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>SalesprojectId_param</name>
+          <expose v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Offer_entity/recordcontainers/db/conditionProcess.js

@@ -4,6 +4,7 @@ import("Sql_lib");
 
 var cond = new SqlCondition();
 cond.andPrepareVars("OFFER.SALESPROJECT_ID", "$param.SalesprojectId_param");
+cond.andPrepareVars("OFFER.CONTACT_ID", "$param.ContactId_param");
 
 //TODO: use a preparedCondition when available #1030812 #1034026
 result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file

entity/Person_entity/Person_entity.aod

@@ -508,6 +508,22 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         <fieldName>LanguagesISO3Code</fieldName>
       </dependency>
     </entityConsumer>
+    <entityConsumer>
+      <name>Offers</name>
+      <title>Offer</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Offer_entity</entityName>
+        <fieldName>ContactOffers</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/offers/children/contactid_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Person_entity/entityfields/offers/children/contactid_param/code.js

+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file

entity/SalesprojectSource_entity/SalesprojectSource_entity.aod

 <?xml version="1.0" encoding="UTF-8"?>
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
   <name>SalesprojectSource_entity</name>
-  <title>Source</title>
+  <title>Touchpoint</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <recordContainer>db</recordContainer>
   <entityFields>
@@ -54,7 +54,7 @@
     </entityField>
     <entityField>
       <name>SOURCE</name>
-      <title>Source</title>
+      <title>Touchpoint</title>
       <consumer>KeywordSources</consumer>
     </entityField>
     <entityConsumer>

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -309,6 +309,10 @@
     <entry>
       <key>Internal (2)</key>
     </entry>
+    <entry>
+      <key>Touchpoints</key>
+      <value>Kontaktpunkte</value>
+    </entry>
     <entry>
       <key>Company Addresses</key>
       <value>Firmenadressen</value>
@@ -2414,6 +2418,10 @@
     <entry>
       <key>${GENDER_OTHER}</key>
     </entry>
+    <entry>
+      <key>Touchpoint</key>
+      <value>Kontaktpunkt</value>
+    </entry>
     <entry>
       <key>Turkey</key>
     </entry>

neonView/PersonMain_view/PersonMain_view.aod

@@ -24,6 +24,11 @@
       <entityField>Documents</entityField>
       <view>DocumentFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>0cb8f431-0377-45cb-a41b-a5716efb0fd0</name>
+      <entityField>Offers</entityField>
+      <view>OfferFilter_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>ec344a07-7b82-4c54-b06b-30ac5b8599f9</name>
       <entityField>Contracts</entityField>

process/Attribute_lib/process.js

@@ -64,7 +64,7 @@ AttributeUtil.getFullAttributeName = function (pAttributeId)
         if (attribute.length > 0)
         {
             attributeNames.push(attribute[0]);
-            pAttributeId = attribute[1];
+                pAttributeId = attribute[1];
         }
         else
             pAttributeId = "";
@@ -234,7 +234,7 @@ $AttributeTypes.BOOLEAN = {
 $AttributeTypes.COMBO = {
     toString : function () {return this.keyword},
     keyword : "COMBO",
-    contentType : "TEXT", 
+    contentType : "UNKNOWN",
     databaseField : "ID_VALUE", 
     entityField : "ID_VALUE"
 };