Merge origin/master

entity/AttributeRelation_entity/AttributeRelation_entity.aod

@@ -32,6 +32,7 @@
       <name>ATTRIBUTERELATION_VALUE</name>
       <title>Value</title>
       <contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/contentTypeProcess.js</contentTypeProcess>
+      <resolution>DAY</resolution>
       <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js</valueProcess>
       <onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js</onValueChange>
     </entityField>

entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod

@@ -15,18 +15,22 @@
     </entityField>
     <entityField>
       <name>CHAR_VALUE</name>
+      <title>CHAR_VALUE</title>
     </entityField>
     <entityField>
       <name>NUMBER_VALUE</name>
+      <contentType>NUMBER</contentType>
     </entityField>
     <entityField>
       <name>BOOL_VALUE</name>
+      <contentType>BOOLEAN</contentType>
     </entityField>
     <entityField>
       <name>AB_KEYWORD_ATTRIBUTE_ID</name>
       <title>Keyword Attribute</title>
       <consumer>KeywordAttributes</consumer>
       <mandatory v="true" />
+      <onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>AB_KEYWORD_ENTRY_ID</name>
@@ -34,7 +38,7 @@
       <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js</valueProcess>
     </entityField>
     <entityProvider>
-      <name>SpecificContainer</name>
+      <name>AttributesForKeywordEntry</name>
       <fieldType>DEPENDENCY_IN</fieldType>
       <title></title>
       <recordContainer>db</recordContainer>
@@ -49,8 +53,9 @@
     </entityProvider>
     <entityParameter>
       <name>containerName_param</name>
-      <expose v="true" />
+      <code>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/code.js</code>
       <triggerRecalculation v="true" />
+      <mandatory v="false" />
       <description>PARAMETER</description>
     </entityParameter>
     <entityConsumer>
@@ -73,25 +78,33 @@
       </children>
     </entityConsumer>
     <entityParameter>
-      <name>keywordEntry_param</name>
+      <name>keywordEntryId_param</name>
       <expose v="true" />
       <triggerRecalculation v="true" />
       <mandatory v="true" />
       <description>PARAMETER</description>
     </entityParameter>
     <entityField>
-      <name>VALUE_PROXY</name>
-      <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/value_proxy/documentation.adoc</documentation>
-      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/value_proxy/valueProcess.js</valueProcess>
+      <name>valueProxy</name>
+      <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/documentation.adoc</documentation>
+      <title>Value</title>
+      <contentTypeProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
+      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
+    </entityField>
+    <entityField>
+      <name>attributeType</name>
+      <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js</valueProcess>
     </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <linkInformation>
         <linkInformation>
-          <name>a52883ee-630c-4373-a4ad-9b1e8c3e8188</name>
+          <name>8e2938d2-e14b-403b-8ae5-875f70bc3f85</name>
           <tableName>AB_KEYWORD_ATTRIBUTERELATION</tableName>
           <primaryKey>AB_KEYWORD_ATTRIBUTERELATIONID</primaryKey>
           <isUIDTable v="true" />

entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/onValueChange.js

+import("system.vars");
+
+vars.set("$field.CHAR_VALUE", "");
+vars.set("$field.BOOL_VALUE", "");
+vars.set("$field.NUMBER_VALUE", "");
\ No newline at end of file

entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js

@@ -3,6 +3,6 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-var keywordEntryId = vars.get("$param.keywordEntry_param");
+var keywordEntryId = vars.get("$param.keywordEntryId_param");
 if(keywordEntryId && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
     result.string(keywordEntryId);
\ No newline at end of file

entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js

+import("system.db");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var id = vars.get("$field.AB_KEYWORD_ATTRIBUTE_ID");
+var type = null;
+if (id)
+{
+    type = db.cell(SqlCondition.begin()
+                               .andPrepare("AB_KEYWORD_ATTRIBUTE.AB_KEYWORD_ATTRIBUTEID", id)
+                               .buildSql("select AB_KEYWORD_ATTRIBUTE.TYPE from AB_KEYWORD_ATTRIBUTE"));
+    type = type.trim();
+}
+result.string(type);
\ No newline at end of file

entity/KeywordAttributeRelation_entity/entityfields/containername_param/code.js

+import("system.db");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var entryId = vars.get("$param.keywordEntryId_param");
+var containerName = db.cell(SqlCondition.begin().andPrepare("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", entryId)
+                                                .buildSql("select AB_KEYWORD_ENTRY.CONTAINER from AB_KEYWORD_ENTRY"));
+
+result.string(containerName);
\ No newline at end of file

entity/KeywordAttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js

+import("system.result");
+import("system.vars");
+
+var type = vars.get("$field.attributeType");
+switch(type)
+{
+    case "BOOL_VALUE":
+        contentType = "BOOLEAN";
+        break;
+    case "NUMBER_VALUE":
+        contentType = "NUMBER";
+        break;
+    case "CHAR_VALUE":
+        contentType = "TEXT";
+        break;
+    default:
+        contentType = "UNKNOWN";
+        break;
+}
+result.string(contentType);
\ No newline at end of file

entity/KeywordAttributeRelation_entity/entityfields/valueproxy/onValueChange.js

+import("system.result");
+import("system.vars");
+import("Entity_lib");
+
+var type = vars.get("$field.attributeType");
+var value = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.valueProxy"));
+switch (type)
+{
+    case "BOOL_VALUE":
+        vars.set("$field.BOOL_VALUE",  value);
+        break;
+    case "NUMBER_VALUE":
+        vars.set("$field.NUMBER_VALUE",  value);
+        break;
+    case "CHAR_VALUE":
+        vars.set("$field.CHAR_VALUE",  value);
+        break;
+}

entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js

+import("system.result");
+import("system.vars");
+
+var type = vars.get("$field.attributeType");
+var value;
+switch (type)
+{
+    case "BOOL_VALUE":
+        value = vars.get("$field.BOOL_VALUE");
+        break;
+    case "NUMBER_VALUE":
+        value = vars.get("$field.NUMBER_VALUE");
+        break;
+    case "CHAR_VALUE":
+        value = vars.get("$field.CHAR_VALUE");
+        break;
+    default: 
+        value = null;
+        break;
+}
+
+result.string(value);
\ No newline at end of file

entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js

+import("system.db");
+import("system.vars");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID", "$param.keywordEntryId_param");
+var condStr = db.translateCondition(cond.build("1 = 2"));
+result.string(condStr);
\ No newline at end of file

entity/KeywordEntry_entity/KeywordEntry_entity.aod

@@ -265,16 +265,12 @@
       <dependency>
         <name>dependency</name>
         <entityName>KeywordAttributeRelation_entity</entityName>
-        <fieldName>SpecificContainer</fieldName>
+        <fieldName>AttributesForKeywordEntry</fieldName>
       </dependency>
       <children>
         <entityParameter>
-          <name>containerName_param</name>
-          <code>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/containername_param/code.js</code>
-        </entityParameter>
-        <entityParameter>
-          <name>keywordEntry_param</name>
-          <code>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/keywordentry_param/code.js</code>
+          <name>keywordEntryId_param</name>
+          <code>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/keywordentryid_param/code.js</code>
         </entityParameter>
       </children>
     </entityConsumer>

entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/containername_param/code.js

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

entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js

-import("system.logging");
 import("system.db");
 import("system.vars");
 import("system.text");

neonView/KeywordAttributeRelationRows_view/KeywordAttributeRelationRows_view.aod

@@ -19,8 +19,8 @@
           <entityField>AB_KEYWORD_ATTRIBUTE_ID</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>04d24334-3b82-4193-b289-6a96f640e521</name>
-          <entityField>CHAR_VALUE</entityField>
+          <name>4d5656d1-a928-47d9-9d88-de8572866a79</name>
+          <entityField>valueProxy</entityField>
         </neonTableColumn>
       </columns>
     </tableViewTemplate>

others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="ab_keyword_attribute/init_SalesprojectProbability_points.xml"/>
+</databaseChangeLog>

others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_points.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.goderbauer" id="a2375d469a-1eda-4b40-802b-312323d9f2e7">
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="2fabbd9a-89d2-49e3-b3aa-1dcbc77252c7"/>
+            <column name="NAME" value="points"/>
+            <column name="TYPE" value="NUMBER_VALUE"/>
+            <column name="CONTAINER" value="SalesprojectProbability"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml

 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_KeywordAttributeType.xml"/>
     <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContactStatus.xml"/>
     <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ActivityDirection.xml"/>
     <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContractPayment.xml"/>
@@ -22,6 +23,6 @@
     <include relativeToChangelogFile="true" file="ab_keyword_entry/init_StockWarehouse.xml"/>
     <include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskStatus.xml"/>
     <include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskType.xml"/>
-    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_KeywordAttributeType.xml"/>
     <include relativeToChangelogFile="true" file="ab_keyword_entry/init_AttributeType.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectProbability.xml"/>
 </databaseChangeLog>