refactorings & todo refactorings

entity/KeywordEntry_entity/onValidation.js

+import("system.translate");
 import("system.db");
 import("system.vars");
 import("system.text");
@@ -15,7 +16,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
         var newCodeNumber = db.cell(cond.buildSql("select " + maskingHelper.max("AB_KEYWORD_ENTRY.SORTING") + " from AB_KEYWORD_ENTRY", "1 = 2"));
         newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
         if (isNaN(newCodeNumber))
-            throw new TypeError();//TODO:add Message
+            throw new TypeError(translate.text("The code number is not a valid number."));
         neon.setFieldValue("$field.SORTING", ++newCodeNumber);
     }
 }
\ No newline at end of file

entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js

+import("system.translate");
 import("system.db");
 import("system.vars");
 import("system.text");
@@ -7,7 +8,7 @@ import("Sql_lib");
 var changedFields = vars.get("$local.changed");
 //whenever the container is changed data that depends on the keyword-container has be "fixed" to keep consistency
 //this could be information like Keyword-attributes or the sorting-position
-//maybe it'd be better to lock KeywordContainer as read-only after creation
+// TODO: maybe it'd be better to lock KeywordContainer as read-only after creation
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && changedFields.indexOf("AB_KEYWORD_ENTRY.CONTAINER") > -1)
 {
     var keyContainer = vars.get("$field.CONTAINER");
@@ -18,7 +19,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && changedFields.in
         var newCodeNumber = db.cell(cond.buildSql("select " + maskingHelper.max("AB_KEYWORD_ENTRY.SORTING") + " from AB_KEYWORD_ENTRY", "1 = 2"));
         newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
         if (isNaN(newCodeNumber))
-            throw new TypeError();//TODO:add Message
+            throw new TypeError(translate.text("The code number is not a valid number."));
 
         var cols = ["SORTING"];
         var vals = [++newCodeNumber];

entity/Offeritem_entity/Offeritem_entity.aod

@@ -62,7 +62,8 @@
       <name>PRODUCT_ID</name>
       <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
       <title>Article</title>
-      <possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js</possibleItemsProcess>
+      <consumer>Products</consumer>
+      <linkedContext>Product_context</linkedContext>
       <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>
@@ -178,6 +179,15 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityConsumer>
+      <name>Products</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Product_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -267,6 +277,10 @@
           <name>UNIT.displayValue</name>
           <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PRODUCT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>

entity/Offeritem_entity/entityfields/info/valueProcess.js

@@ -6,7 +6,7 @@ import("Sql_lib");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    // TODO: loading from db until loading from dfo is possible.
+    // TODO: loading from db until loading from Consumer is possible.
     var productId = vars.get("$field.PRODUCT_ID");
     result.string(db.cell(SqlCondition.begin().andPrepareVars("PRODUCT.PRODUCTID", "$field.PRODUCT_ID").buildSql("select INFO from PRODUCT", "1=2")));
 }
\ No newline at end of file

entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js

-import("system.result");
-import("system.db");
-import("Sql_lib");
-
-//TODO: change field to lookup field
-var sqlUtils = new SqlMaskingUtils();
-var prodsSql = "select PRODUCTID, " + sqlUtils.concat(["PRODUCTCODE", "PRODUCTNAME"], "/") 
-                    + " from PRODUCT";
-
-var prods = db.table(prodsSql);
-
-var retArray = [];
-for(var i = 0; i < prods.length; i++)
-    retArray.push(prods[i]);
-
-result.object(retArray);
\ No newline at end of file

entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js

+import("system.vars");
+import("system.result");
+
+// TODO: remove when #title is used as display value for lookups
+result.string("(select PRODUCT.PRODUCTNAME from PRODUCT where OFFERITEM.PRODUCT_ID = PRODUCT.PRODUCTID)");
\ No newline at end of file

entity/Product_entity/Product_entity.aod

@@ -146,6 +146,14 @@
     <entityProvider>
       <name>#PROVIDER</name>
       <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>edd8a3af-d168-4a3b-871d-39db964c700b</name>
+          <entityName>Offeritem_entity</entityName>
+          <fieldName>Products</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
     </entityProvider>
     <entityConsumer>
       <name>ProductLinks</name>

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -2334,6 +2334,9 @@
     <entry>
       <key>String value</key>
     </entry>
+    <entry>
+      <key>The code number is not a valid number.</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -2687,6 +2687,10 @@
     <entry>
       <key>String value</key>
     </entry>
+    <entry>
+      <key>The code number is not a valid number.</key>
+      <value>The code number is not a valid number.</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -2356,6 +2356,9 @@
     <entry>
       <key>String value</key>
     </entry>
+    <entry>
+      <key>The code number is not a valid number.</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>